From b7911996e40174da078e558454750b809d652663 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 14:01:19 +0200 Subject: [PATCH 1/4] esc button --- Assets/Prefabs/Camera/Cinemachine.prefab | 8 +- Assets/Prefabs/UI/GameUI.prefab | 85 + Assets/Scenes/GameScene.unity | 1545 +++++++++++++---- .../PlacementSystem/CameraSlotClickDetect.cs | 14 +- Assets/Sprites/Rotato.png | Bin 0 -> 4303 bytes Assets/Sprites/Rotato.png.meta | 114 ++ Assets/Sprites/view.png | Bin 0 -> 4857 bytes Assets/Sprites/view.png.meta | 114 ++ 8 files changed, 1534 insertions(+), 346 deletions(-) create mode 100644 Assets/Sprites/Rotato.png create mode 100644 Assets/Sprites/Rotato.png.meta create mode 100644 Assets/Sprites/view.png create mode 100644 Assets/Sprites/view.png.meta diff --git a/Assets/Prefabs/Camera/Cinemachine.prefab b/Assets/Prefabs/Camera/Cinemachine.prefab index ddf86cd..34b10cd 100644 --- a/Assets/Prefabs/Camera/Cinemachine.prefab +++ b/Assets/Prefabs/Camera/Cinemachine.prefab @@ -217,7 +217,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400473914611959530} serializedVersion: 2 - m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686} + m_LocalRotation: {x: 0.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -375,7 +375,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3339643807228368672} serializedVersion: 2 - m_LocalRotation: {x: 0.024118531, y: 0.95756304, z: -0.27462542, w: 0.084096424} + m_LocalRotation: {x: 0.024118524, y: 0.95756304, z: -0.27462542, w: 0.0840964} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -635,8 +635,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6163557566655415017} serializedVersion: 2 - m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686} - m_LocalPosition: {x: 2.430962, y: 14.8024, z: 18.973312} + m_LocalRotation: {x: 0.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683} + m_LocalPosition: {x: 2.4309628, y: 14.8024, z: 18.973312} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/UI/GameUI.prefab b/Assets/Prefabs/UI/GameUI.prefab index 58dc5e7..59fd09c 100644 --- a/Assets/Prefabs/UI/GameUI.prefab +++ b/Assets/Prefabs/UI/GameUI.prefab @@ -656,6 +656,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6120504688934157380} - {fileID: 7134937801519496076} - {fileID: 1264509985005215626} - {fileID: 4189792432299129876} @@ -1783,6 +1784,90 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &2505835712473296967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6120504688934157380} + - component: {fileID: 2340308458956773668} + m_Layer: 0 + m_Name: view + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6120504688934157380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2505835712473296967} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -350, z: 0} + m_LocalScale: {x: 100, y: 100, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3367038424042638127} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2340308458956773668 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2505835712473296967} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: abcc1e7fece93674299c1355e433dcc8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.62, y: 0.97} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2823193282597070615 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3ffe9ae..527c640 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,6 +123,84 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!21 &30433213 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &34605067 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!20 &57718964 stripped Camera: m_CorrespondingSourceObject: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, @@ -233,48 +311,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 66896262} m_PrefabAsset: {fileID: 0} ---- !u!21 &69918180 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] ---- !u!21 &129310422 +--- !u!21 &153844728 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -521,6 +558,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &238014262 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -639,6 +717,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &281113836 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &339673435 GameObject: m_ObjectHideFlags: 0 @@ -861,15 +978,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 359510068} m_PrefabAsset: {fileID: 0} ---- !u!21 &371816795 +--- !u!21 &376383259 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -898,9 +1015,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + - _WidthHeightRadius: {r: 195.653, g: 75.526, b: 57.94, a: 0} m_BuildTextureStacks: [] --- !u!1 &419643241 GameObject: @@ -1007,6 +1122,47 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 419643241} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &431348504 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] --- !u!1 &443970459 GameObject: m_ObjectHideFlags: 0 @@ -1112,47 +1268,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443970459} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &452806913 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &463101172 GameObject: m_ObjectHideFlags: 0 @@ -1270,7 +1385,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &490438992 +--- !u!21 &519532850 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1307,11 +1422,89 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] ---- !u!21 &656188226 +--- !u!21 &614891771 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &661571480 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &739106972 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1348,9 +1541,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] --- !u!1 &739155301 GameObject: @@ -1405,88 +1598,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &752683995 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} - m_BuildTextureStacks: [] ---- !u!21 &763929715 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] --- !u!1 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1605,6 +1716,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &837588615 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &846938778 GameObject: m_ObjectHideFlags: 0 @@ -1710,6 +1860,125 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846938778} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &854169596 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &874259197 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &898986677 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] --- !u!1 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1828,6 +2097,45 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!21 &926068241 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &929277189 PrefabInstance: m_ObjectHideFlags: 0 @@ -1844,27 +2152,27 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 2.4309628 + value: 2.430962 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475683 + value: 0.08475686 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683881 + value: 0.021683885 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475683 + value: 0.08475686 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683881 + value: 0.021683885 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1876,6 +2184,11 @@ PrefabInstance: propertyPath: m_LocalRotation.x value: 0.024118524 objectReference: {fileID: 0} + - target: {fileID: 8510394576666186474, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: escImg + value: + objectReference: {fileID: 961297392} - target: {fileID: 8510394576666186474, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: towerCam @@ -1936,15 +2249,15 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} ---- !u!21 &952890291 +--- !u!21 &937372374 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -1973,10 +2286,14 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} m_BuildTextureStacks: [] +--- !u!1 &961297392 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2505835712473296967, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + m_PrefabInstance: {fileID: 3885720248775086123} + m_PrefabAsset: {fileID: 0} --- !u!1 &968288134 GameObject: m_ObjectHideFlags: 0 @@ -2030,6 +2347,84 @@ Transform: - {fileID: 2004418199} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &969302656 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 195.7, g: 955.508, b: 53, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1000547814 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &1001440767 PrefabInstance: m_ObjectHideFlags: 0 @@ -2098,47 +2493,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3} ---- !u!21 &1012044211 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1001 &1016399493 PrefabInstance: m_ObjectHideFlags: 0 @@ -2243,6 +2597,45 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} +--- !u!21 &1109018139 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1117810916 GameObject: m_ObjectHideFlags: 0 @@ -2348,6 +2741,47 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117810916} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1206673481 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!1 &1211328792 GameObject: m_ObjectHideFlags: 0 @@ -2453,15 +2887,15 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211328792} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &1253675260 +--- !u!21 &1222647567 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -2490,11 +2924,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} m_BuildTextureStacks: [] ---- !u!21 &1304927327 +--- !u!21 &1246601941 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2531,9 +2963,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] --- !u!114 &1335003908 stripped MonoBehaviour: @@ -2559,6 +2991,125 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &1347446484 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1359278147 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] +--- !u!21 &1363231123 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1380990683 GameObject: m_ObjectHideFlags: 0 @@ -2608,15 +3159,15 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1456007328 +--- !u!21 &1448953198 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -2645,50 +3196,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] ---- !u!21 &1465467873 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} m_BuildTextureStacks: [] --- !u!1 &1483033597 GameObject: @@ -3036,6 +3544,164 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644633573} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1693097023 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 195.7, g: 955.508, b: 53, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1696323708 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 195.653, g: 75.526, b: 57.94, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1710503127 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] +--- !u!21 &1782412319 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1785574039 GameObject: m_ObjectHideFlags: 0 @@ -3395,6 +4061,125 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &1911974090 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] +--- !u!21 &1915754729 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1975531611 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2004418198 GameObject: m_ObjectHideFlags: 0 @@ -3449,47 +4234,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TargetCarveGrid: {fileID: 1812668202} ---- !u!21 &2061736992 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: m_ObjectHideFlags: 0 @@ -3558,6 +4302,45 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} +--- !u!21 &2076040126 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &2098922850 PrefabInstance: m_ObjectHideFlags: 0 @@ -3662,7 +4445,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2098922850} m_PrefabAsset: {fileID: 0} ---- !u!21 &2132777435 +--- !u!21 &2138551892 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -3699,9 +4482,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] --- !u!1001 &1982784166430990024 PrefabInstance: @@ -3847,6 +4630,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 116893616487166510, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 34605067} - target: {fileID: 715023913428069073, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Name @@ -3872,21 +4660,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 968422167418274381, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 1230386429136411041, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Camera value: objectReference: {fileID: 57718964} + - target: {fileID: 1786176594686390502, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1222647567} + - target: {fileID: 1959618538053989240, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} + - target: {fileID: 2505835712473296967, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2757975024506450034, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1456007328} + objectReference: {fileID: 1359278147} + - target: {fileID: 3191201847979774313, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1000547814} - target: {fileID: 3197579811349159231, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1465467873} + objectReference: {fileID: 1696323708} - target: {fileID: 3367038424042638127, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Pivot.x @@ -3991,7 +4804,12 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 371816795} + objectReference: {fileID: 1710503127} + - target: {fileID: 3544557342079984576, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_AnchorMax.y @@ -4012,16 +4830,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3828025690817287073, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 854169596} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 452806913} + objectReference: {fileID: 519532850} - target: {fileID: 4061834703391351603, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1304927327} + objectReference: {fileID: 2138551892} - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_AnchorMax.y @@ -4046,7 +4869,37 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 490438992} + objectReference: {fileID: 898986677} + - target: {fileID: 5244029383800369023, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1782412319} + - target: {fileID: 5421973841880411361, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} + - target: {fileID: 5938053569811951145, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} + - target: {fileID: 6216965609204506184, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1448953198} + - target: {fileID: 6811686232260566602, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 281113836} + - target: {fileID: 7117853733399429063, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 1363231123} - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_AnchorMax.y @@ -4087,16 +4940,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7640167117652688837, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2076040126} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 129310422} + objectReference: {fileID: 1246601941} + - target: {fileID: 8954884468777160432, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 837588615} - target: {fileID: 9067100205361516806, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 656188226} + objectReference: {fileID: 969302656} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs index 0196f6e..8941054 100644 --- a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs +++ b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs @@ -5,12 +5,19 @@ public class CameraSlotClickDetect : MonoBehaviour { [SerializeField] private TowerCam towerCam; + [SerializeField] private GameObject escImg; + public Camera mainCamera; public LayerMask layerMask; public LayerMask selectLayer; private SlotManager PrevHoveredSlot; + private void Start() + { + escImg.SetActive(false); + } + void Update() { if (Input.GetMouseButtonDown(0)) @@ -19,6 +26,7 @@ public class CameraSlotClickDetect : MonoBehaviour } if (Input.GetKeyDown(KeyCode.Escape)) { + escImg.SetActive(false); GameManager.Instance.SelectedTower = null; if (towerCam != null) towerCam.ChangeToTarget(null); @@ -41,7 +49,9 @@ public class CameraSlotClickDetect : MonoBehaviour if (tower != null) { GameManager.Instance.SelectedTower = tower; - + + escImg.SetActive(true); + if (towerCam != null) towerCam.ChangeToTarget(tower.gameObject); else @@ -54,6 +64,8 @@ public class CameraSlotClickDetect : MonoBehaviour slotInfo.OnClick(); GameManager.Instance.SelectedTower = null; + escImg.SetActive(false); + if (towerCam != null) towerCam.ChangeToTarget(null); else diff --git a/Assets/Sprites/Rotato.png b/Assets/Sprites/Rotato.png new file mode 100644 index 0000000000000000000000000000000000000000..ccaee84863bce649031b927d8400620415b5c7a9 GIT binary patch literal 4303 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 YfifX*|95@WPW$hLlvjUIEo&D3KR5hGNdN!< literal 0 HcmV?d00001 diff --git a/Assets/Sprites/view.png.meta b/Assets/Sprites/view.png.meta new file mode 100644 index 0000000..b4acdc2 --- /dev/null +++ b/Assets/Sprites/view.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: abcc1e7fece93674299c1355e433dcc8 +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: 3 + 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: 3 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 1e4dbda8e844b3fb937544d8e469c99c5533f1b6 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 14:04:42 +0200 Subject: [PATCH 2/4] mouse rotate indicator --- Assets/Prefabs/UI/GameUI.prefab | 112 ++- Assets/Scenes/GameScene.unity | 1394 ++++++------------------------- Assets/Sprites/Rotato.png.meta | 16 +- 3 files changed, 394 insertions(+), 1128 deletions(-) diff --git a/Assets/Prefabs/UI/GameUI.prefab b/Assets/Prefabs/UI/GameUI.prefab index 59fd09c..82557c6 100644 --- a/Assets/Prefabs/UI/GameUI.prefab +++ b/Assets/Prefabs/UI/GameUI.prefab @@ -656,6 +656,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7783882627863173104} - {fileID: 6120504688934157380} - {fileID: 7134937801519496076} - {fileID: 1264509985005215626} @@ -1800,7 +1801,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6120504688934157380 Transform: m_ObjectHideFlags: 0 @@ -6033,6 +6034,90 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &8953897987241724881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7783882627863173104} + - component: {fileID: 3937151363574610184} + m_Layer: 0 + m_Name: Rotato + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7783882627863173104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953897987241724881} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -675, y: -419, z: 0} + m_LocalScale: {x: 100, y: 100, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3367038424042638127} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3937151363574610184 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8953897987241724881} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: ea2988855e5f9e840a7ada4d8a3bc1c3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.62, y: 0.97} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &9154155236048502357 GameObject: m_ObjectHideFlags: 0 @@ -6208,6 +6293,11 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 1 objectReference: {fileID: 0} + - target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, type: 3} propertyPath: m_Name @@ -6407,6 +6497,11 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, type: 3} propertyPath: m_Name @@ -6594,6 +6689,11 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 1 objectReference: {fileID: 0} + - target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, type: 3} propertyPath: m_Name @@ -6782,6 +6882,11 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 1 objectReference: {fileID: 0} + - target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, type: 3} propertyPath: m_Name @@ -6969,6 +7074,11 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 1 objectReference: {fileID: 0} + - target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.599998 + objectReference: {fileID: 0} - target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 527c640..eb078d8 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,15 +123,15 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &30433213 +--- !u!21 &52845471 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -160,9 +160,11 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} m_BuildTextureStacks: [] ---- !u!21 &34605067 +--- !u!21 &56973359 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -207,6 +209,45 @@ Camera: type: 3} m_PrefabInstance: {fileID: 929277189} m_PrefabAsset: {fileID: 0} +--- !u!21 &63681804 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &66896262 PrefabInstance: m_ObjectHideFlags: 0 @@ -311,7 +352,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 66896262} m_PrefabAsset: {fileID: 0} ---- !u!21 &153844728 +--- !u!21 &115526965 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -348,9 +389,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} m_BuildTextureStacks: [] --- !u!1001 &203396308 PrefabInstance: @@ -558,47 +599,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &238014262 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -717,7 +717,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &281113836 +--- !u!21 &324032822 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -754,7 +754,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} m_BuildTextureStacks: [] --- !u!1 &339673435 GameObject: @@ -978,45 +978,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 359510068} m_PrefabAsset: {fileID: 0} ---- !u!21 &376383259 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 195.653, g: 75.526, b: 57.94, a: 0} - m_BuildTextureStacks: [] --- !u!1 &419643241 GameObject: m_ObjectHideFlags: 0 @@ -1122,47 +1083,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 419643241} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &431348504 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - m_BuildTextureStacks: [] --- !u!1 &443970459 GameObject: m_ObjectHideFlags: 0 @@ -1385,7 +1305,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &519532850 +--- !u!21 &576289600 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1422,128 +1342,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] ---- !u!21 &614891771 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &661571480 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &739106972 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} m_BuildTextureStacks: [] --- !u!1 &739155301 GameObject: @@ -1716,7 +1517,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &837588615 +--- !u!21 &839911674 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1860,85 +1661,7 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846938778} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &854169596 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &874259197 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &898986677 +--- !u!21 &889293378 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2097,45 +1820,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!21 &926068241 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1001 &929277189 PrefabInstance: m_ObjectHideFlags: 0 @@ -2152,37 +1836,37 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 2.430962 + value: 2.4309628 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475686 + value: 0.08475683 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683885 + value: 0.021683881 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.08475686 + value: 0.08475683 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.021683885 + value: 0.021683881 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.0840964 + value: 0.084096424 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: 0.024118524 + value: 0.024118531 objectReference: {fileID: 0} - target: {fileID: 8510394576666186474, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -2249,45 +1933,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} ---- !u!21 &937372374 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1 &961297392 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2505835712473296967, guid: 0a81f2c7ca749af478944c043ef306dc, @@ -2347,46 +1992,7 @@ Transform: - {fileID: 2004418199} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &969302656 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 195.7, g: 955.508, b: 53, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1000547814 +--- !u!21 &983661741 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2597,45 +2203,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1109018139 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1117810916 GameObject: m_ObjectHideFlags: 0 @@ -2741,15 +2308,15 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117810916} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &1206673481 +--- !u!21 &1177447022 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -2778,9 +2345,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + - _WidthHeightRadius: {r: 195.653, g: 75.526, b: 57.94, a: 0} m_BuildTextureStacks: [] --- !u!1 &1211328792 GameObject: @@ -2887,7 +2452,7 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211328792} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &1222647567 +--- !u!21 &1225595518 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2926,111 +2491,7 @@ Material: m_Colors: - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} m_BuildTextureStacks: [] ---- !u!21 &1246601941 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} - m_BuildTextureStacks: [] ---- !u!114 &1335003908 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3, - type: 3} - m_PrefabInstance: {fileID: 2302953136146228920} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1346132657 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, - type: 3} - m_PrefabInstance: {fileID: 2074753046} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!21 &1347446484 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1359278147 +--- !u!21 &1237841921 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -3071,7 +2532,48 @@ Material: - _r: {r: 40, g: 0, b: 0, a: 40} - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] ---- !u!21 &1363231123 +--- !u!21 &1264723450 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] +--- !u!21 &1280347144 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -3110,6 +2612,30 @@ Material: m_Colors: - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} m_BuildTextureStacks: [] +--- !u!114 &1335003908 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3, + type: 3} + m_PrefabInstance: {fileID: 2302953136146228920} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1346132657 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + m_PrefabInstance: {fileID: 2074753046} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1380990683 GameObject: m_ObjectHideFlags: 0 @@ -3159,45 +2685,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1448953198 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1483033597 GameObject: m_ObjectHideFlags: 0 @@ -3439,6 +2926,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1566106973 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] +--- !u!21 &1619034721 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1644633573 GameObject: m_ObjectHideFlags: 0 @@ -3544,164 +3109,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644633573} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &1693097023 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 195.7, g: 955.508, b: 53, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1696323708 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 195.653, g: 75.526, b: 57.94, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1710503127 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] ---- !u!21 &1782412319 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1785574039 GameObject: m_ObjectHideFlags: 0 @@ -4061,125 +3468,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1911974090 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] ---- !u!21 &1915754729 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1975531611 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2004418198 GameObject: m_ObjectHideFlags: 0 @@ -4234,6 +3522,45 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TargetCarveGrid: {fileID: 1812668202} +--- !u!21 &2053698172 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 298.893, g: 281.286, b: 86, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: m_ObjectHideFlags: 0 @@ -4302,7 +3629,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} ---- !u!21 &2076040126 +--- !u!21 &2078837885 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -4339,7 +3666,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 275, g: 265, b: 86, a: 0} + - _WidthHeightRadius: {r: 195.7, g: 955.508, b: 53, a: 0} m_BuildTextureStacks: [] --- !u!1001 &2098922850 PrefabInstance: @@ -4445,47 +3772,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2098922850} m_PrefabAsset: {fileID: 0} ---- !u!21 &2138551892 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] --- !u!1001 &1982784166430990024 PrefabInstance: m_ObjectHideFlags: 0 @@ -4634,37 +3920,12 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 34605067} + objectReference: {fileID: 1225595518} - target: {fileID: 715023913428069073, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Name value: Canvas objectReference: {fileID: 0} - - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 968422167418274381, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.599998 - objectReference: {fileID: 0} - target: {fileID: 1230386429136411041, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Camera @@ -4674,32 +3935,22 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1222647567} - - target: {fileID: 1959618538053989240, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.599998 - objectReference: {fileID: 0} - - target: {fileID: 2505835712473296967, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 56973359} - target: {fileID: 2757975024506450034, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1359278147} + objectReference: {fileID: 1237841921} - target: {fileID: 3191201847979774313, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1000547814} + objectReference: {fileID: 1566106973} - target: {fileID: 3197579811349159231, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1696323708} + objectReference: {fileID: 1177447022} - target: {fileID: 3367038424042638127, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Pivot.x @@ -4804,162 +4055,67 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1710503127} - - target: {fileID: 3544557342079984576, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.599998 - objectReference: {fileID: 0} - - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 576289600} - target: {fileID: 3828025690817287073, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 854169596} + objectReference: {fileID: 1619034721} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 519532850} + objectReference: {fileID: 115526965} - target: {fileID: 4061834703391351603, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 2138551892} - - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 1264723450} - target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 898986677} + objectReference: {fileID: 889293378} - target: {fileID: 5244029383800369023, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1782412319} - - target: {fileID: 5421973841880411361, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.599998 - objectReference: {fileID: 0} - - target: {fileID: 5938053569811951145, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.599998 - objectReference: {fileID: 0} + objectReference: {fileID: 2053698172} - target: {fileID: 6216965609204506184, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1448953198} + objectReference: {fileID: 983661741} - target: {fileID: 6811686232260566602, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 281113836} + objectReference: {fileID: 63681804} - target: {fileID: 7117853733399429063, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1363231123} - - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 1280347144} - target: {fileID: 7640167117652688837, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 2076040126} + objectReference: {fileID: 324032822} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1246601941} + objectReference: {fileID: 52845471} - target: {fileID: 8954884468777160432, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 837588615} + objectReference: {fileID: 839911674} - target: {fileID: 9067100205361516806, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 969302656} + objectReference: {fileID: 2078837885} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Sprites/Rotato.png.meta b/Assets/Sprites/Rotato.png.meta index ddf733f..ff71e81 100644 --- a/Assets/Sprites/Rotato.png.meta +++ b/Assets/Sprites/Rotato.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -99,7 +99,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: From e5da90700a4b6c4bacd98f4a6930ed25e14708a3 Mon Sep 17 00:00:00 2001 From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:05:58 +0200 Subject: [PATCH 3/4] Num enemies now accurate --- Assets/Scripts/Manager/EnemySpawnManager.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Manager/EnemySpawnManager.cs b/Assets/Scripts/Manager/EnemySpawnManager.cs index 79b8cea..895a5f2 100644 --- a/Assets/Scripts/Manager/EnemySpawnManager.cs +++ b/Assets/Scripts/Manager/EnemySpawnManager.cs @@ -55,15 +55,10 @@ public class EnemySpawnManager : MonoBehaviour void Update() { - if (waveQueue.Count <= 0) - { - return; - } - if (HasStarted && IsAutoPlaying) time += Time.deltaTime; - if (waveQueue.Peek().spawnTime < time) + if (waveQueue.Count > 0 && waveQueue.Peek().spawnTime < time) { PopWave(); } @@ -81,6 +76,10 @@ public class EnemySpawnManager : MonoBehaviour void PopWave() { + if (waveQueue.Count <= 0) + return; + + time = 0; WaveNum++; From 146dcae33f4700e52118c53f23d3ea8ffc2a369f Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 14:08:25 +0200 Subject: [PATCH 4/4] health tweaks amount change in prefabs --- Assets/Prefabs/Enemies/GreenBoy1.prefab | 5 +++++ Assets/Prefabs/Enemies/GreenBoy2.prefab | 5 +++++ Assets/Prefabs/Enemies/GreenBoyBoss.prefab | 5 +++++ Assets/Prefabs/Enemies/GreenBoyJetpack.prefab | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/Assets/Prefabs/Enemies/GreenBoy1.prefab b/Assets/Prefabs/Enemies/GreenBoy1.prefab index 60ff989..be7f77d 100644 --- a/Assets/Prefabs/Enemies/GreenBoy1.prefab +++ b/Assets/Prefabs/Enemies/GreenBoy1.prefab @@ -228,6 +228,11 @@ PrefabInstance: propertyPath: m_Name value: GreenBoy1 objectReference: {fileID: 0} + - target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b, + type: 3} + propertyPath: startHealth + value: 20 + objectReference: {fileID: 0} - target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b, type: 3} propertyPath: MoneyDropOnDeath diff --git a/Assets/Prefabs/Enemies/GreenBoy2.prefab b/Assets/Prefabs/Enemies/GreenBoy2.prefab index 9dc5f53..184d0fb 100644 --- a/Assets/Prefabs/Enemies/GreenBoy2.prefab +++ b/Assets/Prefabs/Enemies/GreenBoy2.prefab @@ -442,6 +442,11 @@ PrefabInstance: propertyPath: m_Name value: GreenBoy2 objectReference: {fileID: 0} + - target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b, + type: 3} + propertyPath: startHealth + value: 40 + objectReference: {fileID: 0} - target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b, type: 3} propertyPath: MoneyDropOnDeath diff --git a/Assets/Prefabs/Enemies/GreenBoyBoss.prefab b/Assets/Prefabs/Enemies/GreenBoyBoss.prefab index 2a64c01..d5da343 100644 --- a/Assets/Prefabs/Enemies/GreenBoyBoss.prefab +++ b/Assets/Prefabs/Enemies/GreenBoyBoss.prefab @@ -228,6 +228,11 @@ PrefabInstance: propertyPath: m_Name value: GreenBoyBoss objectReference: {fileID: 0} + - target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b, + type: 3} + propertyPath: startHealth + value: 200 + objectReference: {fileID: 0} - target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b, type: 3} propertyPath: MoneyDropOnDeath diff --git a/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab b/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab index 511f765..7164955 100644 --- a/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab +++ b/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab @@ -334,6 +334,11 @@ PrefabInstance: propertyPath: m_Name value: GreenBoyJetpack objectReference: {fileID: 0} + - target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b, + type: 3} + propertyPath: startHealth + value: 20 + objectReference: {fileID: 0} - target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b, type: 3} propertyPath: MoneyDropOnDeath