Compare commits

..

14 Commits

27 changed files with 5925 additions and 3602 deletions

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 4a1d48d42fb1a3745ac549ee8a7dc869
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 543b0b976a536f3a195577dd11f805cb
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_CatalogRequestsTimeout: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: a75a189819730c84291a11396cb3eb06
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: b09980046ef488c4da99a74f84a93ab2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 50, y: 0, z: 50, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: ddf032ce1c9d94641a63334a30e5ef4d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -244,7 +244,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3904775533281402009
RectTransform:
m_ObjectHideFlags: 0
@@ -290,7 +290,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 0.69411767}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -460,42 +460,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2040289332641198685
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1641892301195112974}
m_Layer: 5
m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1641892301195112974
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2040289332641198685}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4851185077043330041}
m_Father: {fileID: 6450611648602404693}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4984351781827622156
GameObject:
m_ObjectHideFlags: 0
@@ -532,132 +496,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5143547476672447616
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6450611648602404693}
- component: {fileID: 5886936728426371185}
- component: {fileID: 5841446428224414267}
- component: {fileID: 392806442294450671}
m_Layer: 5
m_Name: Scrollbar Horizontal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6450611648602404693
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5143547476672447616}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1641892301195112974}
m_Father: {fileID: 8953872878219298251}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 20}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5886936728426371185
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5143547476672447616}
m_CullTransparentMesh: 1
--- !u!114 &5841446428224414267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5143547476672447616}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &392806442294450671
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5143547476672447616}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8205623120442105654}
m_HandleRect: {fileID: 4851185077043330041}
m_Direction: 0
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5177162791210449881
GameObject:
m_ObjectHideFlags: 0
@@ -690,7 +528,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6343152227034270267}
- {fileID: 6450611648602404693}
- {fileID: 5910649174073682882}
m_Father: {fileID: 3904775533281402009}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -758,7 +595,7 @@ MonoBehaviour:
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 6343152227034270267}
m_HorizontalScrollbar: {fileID: 392806442294450671}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4027688532898315850}
m_HorizontalScrollbarVisibility: 1
m_VerticalScrollbarVisibility: 2
@@ -857,81 +694,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!1 &6080996381716546358
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4851185077043330041}
- component: {fileID: 866994603773895547}
- component: {fileID: 8205623120442105654}
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4851185077043330041
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6080996381716546358}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1641892301195112974}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &866994603773895547
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6080996381716546358}
m_CullTransparentMesh: 1
--- !u!114 &8205623120442105654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6080996381716546358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6320347683044165526
GameObject:
m_ObjectHideFlags: 0
@@ -1528,6 +1290,7 @@ GameObject:
m_Component:
- component: {fileID: 5367126745181614260}
- component: {fileID: 3191639708568242626}
- component: {fileID: 3694449045921836710}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
@@ -1551,8 +1314,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.0000062029276, y: 0.00017811164}
m_SizeDelta: {x: 0, y: 300}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &3191639708568242626
MonoBehaviour:
@@ -1572,7 +1335,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_Spacing: 9
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -1580,6 +1343,20 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &3694449045921836710
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8745518099221218536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 1
--- !u!1 &8907452430183088313
GameObject:
m_ObjectHideFlags: 0
@@ -1701,7 +1478,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1430131615122052721}
m_Direction: 2
m_Value: 0
m_Size: 0.9993475
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

View File

@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 5410305237387619584}
- component: {fileID: 2861081032386749877}
- component: {fileID: 3526026811731855620}
- component: {fileID: 3301002146232492349}
m_Layer: 5
m_Name: Toggle_AuthSetting
m_TagString: Untagged
@@ -35,9 +36,9 @@ RectTransform:
- {fileID: 2596988996425497024}
m_Father: {fileID: 5415421396721871911}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -52.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5410305237387619584
@@ -68,7 +69,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -121,11 +122,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2861081032386749877}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &3301002146232492349
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 522847655149368589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &680796425980981834
GameObject:
m_ObjectHideFlags: 0
@@ -267,7 +283,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -404,9 +420,9 @@ RectTransform:
- {fileID: 2433811602346908521}
m_Father: {fileID: 5415421396721871911}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -17.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5851157329846886569
@@ -437,7 +453,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -490,7 +506,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2385361322007026763}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
@@ -508,7 +524,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -2}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1132907136703894087
GameObject:
@@ -584,8 +600,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -720,8 +736,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1039,7 +1055,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 2979940503107961155}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
@@ -1118,8 +1134,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1238,7 +1254,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1388,6 +1404,7 @@ GameObject:
- component: {fileID: 6073780239663242522}
- component: {fileID: 8378885652016308535}
- component: {fileID: 8175762798521410827}
- component: {fileID: 3952929521072397083}
m_Layer: 5
m_Name: Toggle_MQTTSetting
m_TagString: Untagged
@@ -1411,9 +1428,9 @@ RectTransform:
- {fileID: 4237388401581516903}
m_Father: {fileID: 5415421396721871911}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -122.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6073780239663242522
@@ -1444,7 +1461,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1497,11 +1514,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 8378885652016308535}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &3952929521072397083
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2780813550474746232}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &2831728763685212542
GameObject:
m_ObjectHideFlags: 0
@@ -1969,8 +2001,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2105,8 +2137,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2178,6 +2210,7 @@ GameObject:
- component: {fileID: 7675279395722932038}
- component: {fileID: 8640113132482359271}
- component: {fileID: 3066354958932631838}
- component: {fileID: 3891303720174205123}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@@ -2242,6 +2275,21 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3891303720174205123
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5906891490987607186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &7280161044621465099
GameObject:
m_ObjectHideFlags: 0
@@ -2300,7 +2348,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2375,7 +2423,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2404,6 +2452,7 @@ GameObject:
- component: {fileID: 63617555276793385}
- component: {fileID: 3995109217507155576}
- component: {fileID: 327447223630134517}
- component: {fileID: 616389516660989770}
m_Layer: 5
m_Name: Toggle_APISetting
m_TagString: Untagged
@@ -2427,9 +2476,9 @@ RectTransform:
- {fileID: 3060064463523730758}
m_Father: {fileID: 5415421396721871911}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -87.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &63617555276793385
@@ -2460,7 +2509,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2513,11 +2562,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 3995109217507155576}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &616389516660989770
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7410169318399637521}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &7760239339309219648
GameObject:
m_ObjectHideFlags: 0
@@ -2576,7 +2640,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2605,6 +2669,7 @@ GameObject:
- component: {fileID: 3699255322847400887}
- component: {fileID: 7787229179050832729}
- component: {fileID: 693345390380284954}
- component: {fileID: 5985483412012896340}
m_Layer: 5
m_Name: Toggle_AssetSetting
m_TagString: Untagged
@@ -2628,9 +2693,9 @@ RectTransform:
- {fileID: 5897254447948056194}
m_Father: {fileID: 5415421396721871911}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -157.5}
m_SizeDelta: {x: 400, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3699255322847400887
@@ -2661,7 +2726,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 77609f9a7645dc24f99ecfe7e3f810f6, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2714,11 +2779,26 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 7787229179050832729}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
m_Group: {fileID: 2912502008314567660}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!114 &5985483412012896340
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7809808732213277844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8358864612680385020
GameObject:
m_ObjectHideFlags: 0
@@ -2736,7 +2816,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4361438021496185155
RectTransform:
m_ObjectHideFlags: 0
@@ -2758,8 +2838,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -95}
m_SizeDelta: {x: 0, y: -190}
m_AnchoredPosition: {x: 0, y: -92.5}
m_SizeDelta: {x: 0, y: -185}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4350688116203905947
CanvasRenderer:
@@ -2841,7 +2921,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.6666667, b: 0.2509804, a: 1}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -61,7 +61,9 @@ namespace Studio.RuntimeGizmo
workGizmoId = GizmoId.None;
}
public void SetWorkGizmoId(GizmoId gizmoId)
{
{
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
return;
objectMoveGizmo.Gizmo.SetEnabled(false);
objectRotationGizmo.Gizmo.SetEnabled(false);
objectScaleGizmo.Gizmo.SetEnabled(false);
@@ -102,6 +104,8 @@ namespace Studio.RuntimeGizmo
}
public void SetGizmoTargetObjects(List<GameObject> objects)
{
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
return;
selectedObjects.Clear();
selectedObjects.AddRange(objects);
objectMoveGizmo.SetTargetObjects(selectedObjects);
@@ -111,6 +115,10 @@ namespace Studio.RuntimeGizmo
workGizmo.Gizmo.SetEnabled(selectedObjects.Count != 0);
}
public void ResetGizmo()
{
SetGizmoTargetObjects(new List<GameObject>());
}
private void OnGizmoDragBegin(Gizmo gizmo, int t)
{
onTransformBegin?.Invoke();

View File

@@ -125,7 +125,6 @@ namespace Studio.AssetTool
public GameObject CreateAsset(string name)
{
AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file);
OnAssetSelected(item);
GameObject obj = selectRenderObject.gameObject;
OnAssetDropped(item);
@@ -283,7 +282,7 @@ namespace Studio.AssetTool
}
internal void OnSelectObjects(string name, List<GameObject> selectedObjects)
{
if (selectedObjects.Count == 0)
if (selectedObjects.Count == 0)
return;
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
if (ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)

View File

@@ -141,7 +141,6 @@ namespace Studio.AssetTool
CommandInvoker.instance.Invoke(new ResetGizmoCommand());
DeselectAll();
}
CanvasManager.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
}
public void DeselectAll()
@@ -429,7 +428,7 @@ namespace Studio.AssetTool
#else
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy);
shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
#endif
var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable);

View File

@@ -8,7 +8,6 @@ namespace Studio.Manage
public PopupCanvasHandler(Canvas_Popup canvas_popup)
{
var canvas_static = CanvasManager.instance.GetCanvas<Canvas_Static>();
//canvas_popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_popup.panel_assetproperties.Open);
canvas_popup.panel_thumbnail.onGetPosition += canvas_popup.panel_assetlibrary.GetPositionX;
canvas_popup.panel_start.onClickNewProject += canvas_popup.panel_newprojectinfo.Open;
@@ -38,7 +37,6 @@ namespace Studio.Manage
canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active;
canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active;
canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active;
canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active;
canvas_popup.panel_startsetting.onClickAssetSetting += canvas_popup.panel_assetsetting.Active;
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;

View File

@@ -1,4 +1,5 @@
using NUnit.Framework;
using NUnit.Framework;
using Studio.AssetTool;
using Studio.Conifg;
using Studio.Manage;
using Studio.Util;
@@ -28,8 +29,10 @@ namespace Studio.Manage
public void ChangeState()
{
ManagerHub.instance.Get<RenderObjectHandler>().rtgController.ResetGizmo();
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
curState = curState == EState.Stop ? EState.Run : EState.Stop;
Debug.Log("curState " + curState);
switch (curState)
{
case EState.Run:

View File

@@ -1,4 +1,6 @@
namespace Studio.Manage
using Studio.UI;
namespace Studio.Manage
{
public class StudioPopupCanvasHandler : CanvasEventHandler
{
@@ -15,13 +17,10 @@
canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_quickstart.Close;
canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close;
canvas_popup.panel_scenetab.onSceneSettingTab += canvas_popup.panel_startsetting.Active;
canvas_popup.panel_startsetting.onClickAppSetting += canvas_popup.panel_appsetting.Active;
canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active;
canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active;
canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active;
canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active;
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;

View File

@@ -61,6 +61,9 @@ namespace Studio.Dynamic.TwinObject
renderObject = GetComponent<CustomAssetRenderObject>();
if (!string.IsNullOrEmpty(renderObject.code))
{
moveSpeed = AGVManager.instance.AGVMoveSpeed;
rotSpeed = AGVManager.instance.AGVRotateSpeed;
Init(renderObject.componetKey, transform.position);
}
}
@@ -168,5 +171,11 @@ namespace Studio.Dynamic.TwinObject
{
AGVManager.instance.SetCopyObject(isAuto, renderObject);
}
protected override void OnDestroy()
{
base.OnDestroy();
StudioService.instance.RemoveTypeIdListener(renderObject.topic, renderObject.code);
}
}
}

View File

@@ -180,6 +180,7 @@ namespace Studio.Staic.STKC
private void OnDestroy()
{
ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
if (curType == null)
return;
StudioService.instance.RemoveTypeIdListener(curType, transform.name);

View File

@@ -1,11 +1,7 @@
using UnityEngine;
using Studio.Manage;
using Studio.UI;
using Studio.Manage;
using XRLib.UI;
using Studio;
using Studio.UI;
namespace Studio
namespace Studio.UI
{
public class Canvas_Studio_Popup : CanvasBase
{

View File

@@ -93,6 +93,7 @@ namespace Studio.UI
InputField_ScaleY.onDeselect.AddListener(OnDeselectInputField);
InputField_ScaleZ.onDeselect.AddListener(OnDeselectInputField);
InputField_ID.onValueChanged.AddListener(OnChangedID);
InputField_Name.readOnly = true;
addComponetModal = GetComponentInChildren<AddComponetModal>();
connectionModal = GetComponentInChildren<ConnectionModal>();
addComponetModal.Init();

View File

@@ -6,6 +6,7 @@ using Studio.Util;
using XRLib;
using XRLib.UI;
using Studio.AssetTool;
using Studio.Manage;
namespace Studio.UI
{
@@ -44,7 +45,7 @@ namespace Studio.UI
private void Update()
{
if (selectedObject == null || selectedObject.isCollided)
if (selectedObject == null || selectedObject.isCollided || ManagerHub.instance.Get<RunManager>().curState == RunManager.EState.Run)
{
DeactivateAll();
return;

View File

@@ -41,22 +41,24 @@ namespace Studio.UI
}
private void OnSceneStartSettingValueChanged(bool isOn)
{
Debug.Log(isOn);
Debug.Log($"Toggle_SceneStartSetting {isOn}");
onSceneSettingTab?.Invoke(isOn);
}
private void OnClickAddSceneTabButton()
{
Debug.Log("On Click Add Scene Tab Button");
var item = Instantiate(prf_SceneTabButton, Content);
var itemName = "Scene_" + index;
item.onClickSceneTab += OnClcikSceneTab;
item.onClickSceneTab += OnClickSceneTab;
item.SetSceneTabButton(toggleGroup, itemName);
sceneTabButtons.Add(item);
index++;
Button_AddSceneTab.transform.SetAsLastSibling();
}
private void OnClcikSceneTab(bool isOn)
private void OnClickSceneTab(bool isOn)
{
Debug.Log($"On Click Scene Tab: {isOn}");
onSceneTab?.Invoke(isOn);
}
}

View File

@@ -18,26 +18,17 @@ namespace Studio.UI
private Toggle Toggle_AuthSetting;
private Toggle Toggle_APISetting;
private Toggle Toggle_MQTTSetting;
private Toggle Toggle_3DFactorySetting;
private Toggle Toggle_AssetSetting;
public Action<bool> onClickAppSetting;
public Action<bool> onClickAuthSetting;
public Action<bool> onClickAPISetting;
public Action<bool> onClickMQTTSetting;
public Action<bool> onClick3DFactorySetting;
public Action<bool> onClickAssetSetting;
#region TestButton
private Button Button_Load;
private Button Button_Save;
public Action onClickLoadButton;
public Action onClickSaveButton;
#endregion
public void Active(bool isOn)
{
Debug.Log("Panel_StartSetting Active: " + isOn);
SetActive(isOn);
if(isOn == false)
@@ -74,55 +65,57 @@ namespace Studio.UI
Toggle_AuthSetting.onValueChanged.AddListener(OnClickAuthSettingButton);
Toggle_APISetting.onValueChanged.AddListener(OnClickAPISettingButton);
Toggle_MQTTSetting.onValueChanged.AddListener(OnClickMQTTSettingButton);
Toggle_3DFactorySetting.onValueChanged.AddListener(OnClick3DFactorySettingButton);
Toggle_AssetSetting.onValueChanged.AddListener(OnClickAssetSettingButton);
SetToggleChanged(this.Toggle_AppSetting, true);
Button_Load.onClick.AddListener(OnClickLoadButton);
Button_Save.onClick.AddListener(OnClickSaveButton);
}
private void SetToggleChanged(Toggle toggle, bool isOn)
{
Debug.Log($"SetToggleChanged: {toggle.name} isOn: {isOn}");
selectedToggle = TabToggles.GetFirstActiveToggle();
var image = toggle.transform.GetChild(0).GetComponent<Image>();
image.gameObject.SetActive(isOn);
TextMeshProUGUI text = toggle.GetComponentInChildren<TextMeshProUGUI>();
if (isOn)
{
text.color = Color.white;
}
else
{
text.color = Color.black;
}
}
private void OnClickAppSettingButton(bool isOn)
{
Debug.Log($"OnClickAppSettingButton: {isOn}");
SetToggleChanged(Toggle_AppSetting, isOn);
onClickAppSetting?.Invoke(isOn);
}
private void OnClickAuthSettingButton(bool isOn)
{
Debug.Log($"OnClickAuthSettingButton: {isOn}");
SetToggleChanged(Toggle_AuthSetting, isOn);
onClickAuthSetting?.Invoke(isOn);
}
private void OnClickAPISettingButton(bool isOn)
{
Debug.Log($"OnClickAPISettingButton: {isOn}");
SetToggleChanged(Toggle_APISetting, isOn);
onClickAPISetting?.Invoke(isOn);
}
private void OnClickMQTTSettingButton(bool isOn)
{
Debug.Log($"OnClickMQTTSettingButton: {isOn}");
SetToggleChanged(Toggle_MQTTSetting, isOn);
onClickMQTTSetting?.Invoke(isOn);
}
private void OnClick3DFactorySettingButton(bool isOn)
{
SetToggleChanged(Toggle_3DFactorySetting, isOn);
onClick3DFactorySetting?.Invoke(isOn);
}
private void OnClickAssetSettingButton(bool isOn)
{
Debug.Log($"OnClickAssetSettingButton: {isOn}");
SetToggleChanged(Toggle_AssetSetting, isOn);
onClickAssetSetting?.Invoke(isOn);
}
private void OnClickSaveButton()
{
onClickSaveButton?.Invoke();
}
private void OnClickLoadButton()
{
onClickLoadButton?.Invoke();
}
}
}