From ab61c9cc178b2806e1339bf5ae99c7ca7579180a Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sun, 2 Feb 2025 23:44:58 +0900 Subject: [PATCH] =?UTF-8?q?UI=20=ED=94=84=EB=A6=AC=ED=8C=B9=20=ED=95=B4?= =?UTF-8?q?=EC=83=81=EB=8F=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.GameOverUI.prefab | 4 +- .../Resources/UI/Prefabs/UI.GameWinUI.prefab | 4 +- .../Resources/UI/Prefabs/UI.InGameUI.prefab | 32 +- .../Resources/UI/Prefabs/UI.PauseUI.prefab | 19 +- .../Resources/UI/Prefabs/UI.TitleUI.prefab | 2 +- .../Personal Scenes/dev_mingu/Ingame.unity | 1467 +++-------------- .../Assets/Gameton/Scripts/Common/UIList.cs | 5 + .../Assets/Gameton/Scripts/Monster.meta | 8 + .../Assets/Gameton/Scripts/UI/PauseUI.cs | 18 + .../Assets/Gameton/Scripts/UI/PauseUI.cs.meta | 11 + 10 files changed, 320 insertions(+), 1250 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Scripts/Monster.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab index f56844e7..2c2965af 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab @@ -276,10 +276,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index 9d51fa30..b04e2bc0 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -1474,10 +1474,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab index 781ebc66..1dd392ca 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Option Icon Change + m_text: Pause Icon Change m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -281,7 +281,7 @@ GameObject: - component: {fileID: 8198685306568731603} - component: {fileID: 5060126576529577030} m_Layer: 5 - m_Name: OptionButton + m_Name: PauseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -304,7 +304,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 580, y: 290} + m_AnchoredPosition: {x: 880.99994, y: 461} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2800419191577383493 @@ -388,7 +388,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8198685306568731603} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 5289490854944505444, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} + m_TargetAssemblyTypeName: TON.PauseUI, Assembly-CSharp + m_MethodName: OnPressPause + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2230928671015106332 GameObject: m_ObjectHideFlags: 0 @@ -467,10 +479,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -664,7 +676,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -64.4, y: 315} + m_AnchoredPosition: {x: -55, y: 485} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2198073928601018855 @@ -798,7 +810,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -445, y: 286} + m_AnchoredPosition: {x: -770, y: 470} m_SizeDelta: {x: 220.9956, y: 43.3312} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5743897069254935881 @@ -873,7 +885,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -574, y: 286} + m_AnchoredPosition: {x: -899, y: 470.00003} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7099043198836620589 @@ -950,7 +962,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 455, y: 290} + m_AnchoredPosition: {x: 756, y: 461} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &298478946457726797 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab index 55f7ffcd..00182f56 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -948,7 +948,7 @@ GameObject: - component: {fileID: 8159543166291025693} - component: {fileID: 5432795212265071098} m_Layer: 5 - m_Name: GameWinText + m_Name: GamePauseText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1350,6 +1350,7 @@ GameObject: - component: {fileID: 4828925174686314140} - component: {fileID: 174779954931244145} - component: {fileID: 4186505378186692388} + - component: {fileID: 5289490854944505444} m_Layer: 5 m_Name: UI.PauseUI m_TagString: Untagged @@ -1415,10 +1416,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -1443,3 +1444,15 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!114 &5289490854944505444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671327827710467541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94f5b0c2758d43b42a74f7fe4ae3a7e4, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab index 6a1bd607..681634d1 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab @@ -255,7 +255,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 55 --- !u!114 &1005971612728675762 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity index 10228867..90dc22b1 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity @@ -122,216 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!213 &140774195 -Sprite: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 4 - height: 4 - m_Offset: {x: 0, y: 0} - m_Border: {x: 0, y: 0, z: 0, w: 0} - m_PixelsToUnits: 4 - m_Pivot: {x: 0.5, y: 0.5} - m_Extrude: 0 - m_IsPolygon: 0 - m_AtlasName: - m_PackingTag: - m_RenderDataKey: - 00000000000000000000000000000000: 0 - m_AtlasTags: [] - m_SpriteAtlas: {fileID: 0} - m_RD: - serializedVersion: 3 - texture: {fileID: 0} - alphaTexture: {fileID: 0} - secondaryTextures: [] - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_IndexBuffer: 000001000200020001000300 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 1 - offset: 0 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 80 - _typelessdata: 000000bf0000003f000000000000003f0000003f00000000000000bf000000bf000000000000003f000000bf00000000000000000000803f0000803f0000803f00000000000000000000803f00000000 - m_Bindpose: [] - textureRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 4 - height: 4 - textureRectOffset: {x: 0, y: 0} - atlasRectOffset: {x: -1, y: -1} - settingsRaw: 64 - uvTransform: {x: 4, y: 2, z: 4, w: 2} - downscaleMultiplier: 1 - m_AtlasRD: - serializedVersion: 3 - texture: {fileID: 0} - alphaTexture: {fileID: 0} - secondaryTextures: [] - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_IndexBuffer: 000001000200020001000300 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 1 - offset: 0 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 80 - _typelessdata: 000000bf0000003f000000000000003f0000003f00000000000000bf000000bf000000000000003f000000bf00000000000000000000803f0000803f0000803f00000000000000000000803f00000000 - m_Bindpose: [] - textureRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 4 - height: 4 - textureRectOffset: {x: 0, y: 0} - atlasRectOffset: {x: -1, y: -1} - settingsRaw: 64 - uvTransform: {x: 4, y: 2, z: 4, w: 2} - downscaleMultiplier: 1 - m_PhysicsShape: [] - m_Bones: [] - m_SpriteID: --- !u!1 &257363987 GameObject: m_ObjectHideFlags: 0 @@ -594,46 +384,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &658533491 -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: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 900, g: 300, b: 80, a: 0} - m_BuildTextureStacks: [] --- !u!1 &718284630 GameObject: m_ObjectHideFlags: 0 @@ -665,6 +415,71 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &720822433 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 866829734583457878, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_SpriteHash + value: 288431053 + objectReference: {fileID: 0} + - target: {fileID: 866829734583457880, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616562, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_Name + value: BlueDragon + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalPosition.x + value: 14.96 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalPosition.y + value: -8.33 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} --- !u!1 &770762291 GameObject: m_ObjectHideFlags: 0 @@ -6839,13 +6654,13 @@ Tilemap: - first: {x: -19, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -18, y: 6, z: 0} second: serializedVersion: 2 @@ -7219,18 +7034,18 @@ Tilemap: - first: {x: -19, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -18, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 428 - m_TileSpriteIndex: 144 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -7599,18 +7414,18 @@ Tilemap: - first: {x: -19, y: 8, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -18, y: 8, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -7979,18 +7794,18 @@ Tilemap: - first: {x: -19, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -18, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8159,8 +7974,8 @@ Tilemap: - first: {x: -1, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8169,8 +7984,8 @@ Tilemap: - first: {x: 0, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8179,8 +7994,8 @@ Tilemap: - first: {x: 1, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8189,8 +8004,8 @@ Tilemap: - first: {x: 2, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8199,8 +8014,8 @@ Tilemap: - first: {x: 3, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8209,8 +8024,8 @@ Tilemap: - first: {x: 4, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8219,8 +8034,8 @@ Tilemap: - first: {x: 5, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8229,8 +8044,8 @@ Tilemap: - first: {x: 6, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 432 - m_TileSpriteIndex: 155 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8239,8 +8054,8 @@ Tilemap: - first: {x: 7, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8249,8 +8064,8 @@ Tilemap: - first: {x: 8, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8259,8 +8074,8 @@ Tilemap: - first: {x: 9, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 188 - m_TileSpriteIndex: 22 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8269,8 +8084,8 @@ Tilemap: - first: {x: 10, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 187 - m_TileSpriteIndex: 21 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8359,148 +8174,148 @@ Tilemap: - first: {x: -19, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -18, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -16, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -15, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -14, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -13, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -12, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -11, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -10, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -9, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -8, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -7, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -6, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 - first: {x: -5, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8509,8 +8324,8 @@ Tilemap: - first: {x: -4, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8519,8 +8334,8 @@ Tilemap: - first: {x: -3, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8529,8 +8344,8 @@ Tilemap: - first: {x: -2, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8539,8 +8354,8 @@ Tilemap: - first: {x: -1, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 436 - m_TileSpriteIndex: 166 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8649,8 +8464,8 @@ Tilemap: - first: {x: 10, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 273 - m_TileSpriteIndex: 20 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8659,8 +8474,8 @@ Tilemap: - first: {x: 11, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 272 - m_TileSpriteIndex: 19 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8669,8 +8484,8 @@ Tilemap: - first: {x: 12, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 271 - m_TileSpriteIndex: 18 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8679,8 +8494,8 @@ Tilemap: - first: {x: 13, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 270 - m_TileSpriteIndex: 17 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8689,8 +8504,8 @@ Tilemap: - first: {x: 14, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 269 - m_TileSpriteIndex: 16 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8699,8 +8514,8 @@ Tilemap: - first: {x: 15, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 268 - m_TileSpriteIndex: 15 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8709,8 +8524,8 @@ Tilemap: - first: {x: 16, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 267 - m_TileSpriteIndex: 14 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8719,8 +8534,8 @@ Tilemap: - first: {x: 17, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 266 - m_TileSpriteIndex: 13 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 @@ -8729,17 +8544,15 @@ Tilemap: - first: {x: 18, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 309 + m_TileSpriteIndex: 45 m_TileMatrixIndex: 0 - m_TileColorIndex: 0 + m_TileColorIndex: 1 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741827 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 19 - m_Data: {fileID: 1452686887} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -9112,9 +8925,11 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 7 + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 2330fe365fbdb08469111bdcdbc80012, type: 2} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 95b1d346f13787644b7d620635f7595e, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -9270,21 +9085,21 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: e7f7de9123c21f34780d80a923278a89, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 003908192ed8d3641ad7ac55c1e36d88, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 1a3dab3e5cfff884aaba321fedd78ba8, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: cdfe7d220e99e574fb4f283c1ee0e314, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 19ddbf384c16bda438fba0fed0c49aae, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: ae55ca7a1ae387e4aac07a9a75f2a05a, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 4f1e4f625f87f8e4295ef7c464108569, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: a6bf5a35e1878f24796174475c803a0b, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 29f1cf2b93e46f74991a9ea429d01be8, type: 2} @@ -9356,7 +9171,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 1a886a38b2838814b93e28f6c0d5c244, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d9f18fef4d413094692a0613a156d9f6, type: 2} - - m_RefCount: 1 + - m_RefCount: 48 m_Data: {fileID: 11400000, guid: 95308af1a811e1f4d888ae2dd3deef33, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: f80e2f144e3c4c149b8411745c6607f3, type: 2} @@ -9594,7 +9409,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: dc9df826fca68c14eb2bbe387f2d8c25, type: 2} - m_RefCount: 28 m_Data: {fileID: 11400000, guid: 5c8c287b4462c4041b42383efe59b9c3, type: 2} - - m_RefCount: 54 + - m_RefCount: 53 m_Data: {fileID: 11400000, guid: c35577006df99b041abba81e9c873a7a, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: a00b9cd2c9c93c144a9daeac2ee2edce, type: 2} @@ -9602,7 +9417,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 30b0084324725c74f8d97e072bdb2c4f, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 1ea4be80380085e4698b133f4b26fbab, type: 2} - - m_RefCount: 54 + - m_RefCount: 48 m_Data: {fileID: 11400000, guid: 3678519bf2a94b44baac033d3c1f37ed, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 49cbd3d7c794fa04797816c2512933d7, type: 2} @@ -9610,7 +9425,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 3d19357b12184214f80c35f0558df882, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: f557f4adf0b157b4fbe2b5f033d0c27b, type: 2} - - m_RefCount: 60 + - m_RefCount: 49 m_Data: {fileID: 11400000, guid: 90b4754976ee71e4b9f90879864be27f, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d0449e3b1ad7af242860aa97ce09689d, type: 2} @@ -9619,8 +9434,8 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: fab94e57af1df7944a1243af1de2b8e4, type: 2} m_TileSpriteArray: - - m_RefCount: 19 - m_Data: {fileID: 140774195} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 28 m_Data: {fileID: -1802928871, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 @@ -9645,25 +9460,25 @@ Tilemap: m_Data: {fileID: 1931865815, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: -256183057, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: 216264077, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 287889550, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 1595238411, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 377627921, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: -1404088259, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 1673001909, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 406751455, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: -163229158, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: -1888422307, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: 641932248, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: 767975866, guid: add648a765b44c2b94c3d794c59140aa, type: 3} @@ -9709,7 +9524,7 @@ Tilemap: m_Data: {fileID: 939109023, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: 2049257377, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 1 + - m_RefCount: 48 m_Data: {fileID: -1956790738, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: -307813938, guid: add648a765b44c2b94c3d794c59140aa, type: 3} @@ -9907,7 +9722,7 @@ Tilemap: m_Data: {fileID: 1706025186, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 28 m_Data: {fileID: -620631959, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 54 + - m_RefCount: 53 m_Data: {fileID: 354457156, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: -828659457, guid: add648a765b44c2b94c3d794c59140aa, type: 3} @@ -9929,7 +9744,7 @@ Tilemap: m_Data: {fileID: 1522004871, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: -611943429, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 54 + - m_RefCount: 48 m_Data: {fileID: 1287453110, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: 1776951477, guid: add648a765b44c2b94c3d794c59140aa, type: 3} @@ -9951,7 +9766,7 @@ Tilemap: m_Data: {fileID: -1613499043, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: 1205641514, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - - m_RefCount: 60 + - m_RefCount: 49 m_Data: {fileID: 1840512771, guid: add648a765b44c2b94c3d794c59140aa, type: 3} - m_RefCount: 1 m_Data: {fileID: 1263578017, guid: add648a765b44c2b94c3d794c59140aa, type: 3} @@ -9993,9 +9808,9 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 19 - m_Data: {r: 0.8455156, g: 0.4167902, b: 0.42750528, a: 1} - - m_RefCount: 779 + - m_RefCount: 0 + m_Data: {r: 4.3987e-41, g: 4.3987e-41, b: 4.3987e-41, a: 4.3987e-41} + - m_RefCount: 798 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -10021,46 +9836,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!21 &1095300152 -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: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 900, g: 300, b: 80, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1185367601 GameObject: m_ObjectHideFlags: 0 @@ -10185,46 +9960,6 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 265027071} ---- !u!21 &1235046913 -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: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 900, g: 300, b: 80, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1333310376 stripped GameObject: m_CorrespondingSourceObject: {fileID: -2253911629886400664, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} @@ -10304,40 +10039,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42cacd7efc665ca49952258bfab50cc8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1452686887 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Sprite: {fileID: 140774195} - m_Color: {r: 0.8455156, g: 0.4167902, b: 0.42750528, a: 1} - m_Transform: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_InstancedGameObject: {fileID: 0} - m_Flags: 3 - m_ColliderType: 1 --- !u!1 &1490603789 GameObject: m_ObjectHideFlags: 0 @@ -10351,7 +10052,6 @@ GameObject: - component: {fileID: 1490603791} - component: {fileID: 1490603793} - component: {fileID: 1490603795} - - component: {fileID: 1490603794} m_Layer: 0 m_Name: Tilemap m_TagString: Ground @@ -12341,261 +12041,6 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 ---- !u!66 &1490603794 -CompositeCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1490603789} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_GeometryType: 0 - m_GenerationType: 0 - m_EdgeRadius: 0 - m_ColliderPaths: - - m_Collider: {fileID: 1490603793} - m_ColliderPaths: - - - X: 190000000 - Y: 110000000 - - X: -190000000 - Y: 110000000 - - X: -190000000 - Y: -100000000 - - X: 190000000 - Y: -100000000 - - - X: -180000000 - Y: -90000000 - - X: -180000000 - Y: 100000000 - - X: 180000000 - Y: 100000000 - - X: 180000000 - Y: -90000000 - - X: -20000000 - Y: -90000000 - - X: -20000000 - Y: -80000000 - - X: -30000000 - Y: -80000000 - - X: -30000000 - Y: -70000000 - - X: -50000000 - Y: -70000000 - - X: -50000000 - Y: -80000000 - - X: -70000000 - Y: -80000000 - - X: -70000000 - Y: -90000000 - - - X: 170000000 - Y: 70000000 - - X: 160000000 - Y: 70000000 - - X: 160000000 - Y: 80000000 - - X: 120000000 - Y: 80000000 - - X: 120000000 - Y: 60000000 - - X: 170000000 - Y: 60000000 - - - X: 0 - Y: 50000000 - - X: -10000000 - Y: 50000000 - - X: -10000000 - Y: 60000000 - - X: -30000000 - Y: 60000000 - - X: -30000000 - Y: 50000000 - - X: -60000000 - Y: 50000000 - - X: -60000000 - Y: 40000000 - - X: 0 - Y: 40000000 - - - X: 100000000 - Y: 20000000 - - X: 80000000 - Y: 20000000 - - X: 80000000 - Y: 30000000 - - X: 70000000 - Y: 30000000 - - X: 70000000 - Y: 20000000 - - X: 50000000 - Y: 20000000 - - X: 50000000 - Y: 10000000 - - X: 100000000 - Y: 10000000 - - - X: -100000000 - Y: 20000000 - - X: -150000000 - Y: 20000000 - - X: -150000000 - Y: 10000000 - - X: -100000000 - Y: 10000000 - - - X: 170000000 - Y: 0 - - X: 160000000 - Y: 0 - - X: 160000000 - Y: 10000000 - - X: 140000000 - Y: 10000000 - - X: 140000000 - Y: 0 - - X: 130000000 - Y: 0 - - X: 130000000 - Y: -10000000 - - X: 120000000 - Y: -10000000 - - X: 120000000 - Y: -20000000 - - X: 170000000 - Y: -20000000 - - - X: 20000000 - Y: -20000000 - - X: -30000000 - Y: -20000000 - - X: -30000000 - Y: -30000000 - - X: 20000000 - Y: -30000000 - - - X: 110000000 - Y: -40000000 - - X: 100000000 - Y: -40000000 - - X: 100000000 - Y: -20000000 - - X: 80000000 - Y: -20000000 - - X: 80000000 - Y: -30000000 - - X: 70000000 - Y: -30000000 - - X: 70000000 - Y: -40000000 - - X: 50000000 - Y: -40000000 - - X: 50000000 - Y: -50000000 - - X: 110000000 - Y: -50000000 - - - X: -80000000 - Y: -40000000 - - X: -130000000 - Y: -40000000 - - X: -130000000 - Y: -50000000 - - X: -80000000 - Y: -50000000 - m_CompositePaths: - m_Paths: - - - {x: 18.999971, y: -10} - - {x: 18.999971, y: 11} - - {x: -19, y: 10.99997} - - {x: -18.999971, y: -10} - - - {x: -7, y: -8.99997} - - {x: -18, y: -8.99997} - - {x: -17.999971, y: 10} - - {x: 18, y: 9.99997} - - {x: 17.999971, y: -9} - - {x: -2, y: -8.99997} - - {x: -2.0000293, y: -8} - - {x: -3, y: -7.9999704} - - {x: -3.0000293, y: -7} - - {x: -5, y: -7.0000296} - - {x: -5.0000296, y: -8} - - {x: -7, y: -8.00003} - - - {x: 16.999971, y: 6} - - {x: 16.999971, y: 7} - - {x: 16, y: 7.0000296} - - {x: 15.999971, y: 8} - - {x: 12, y: 7.9999704} - - {x: 12.00003, y: 6} - - - {x: -0.000029300001, y: 4} - - {x: -0.000029300001, y: 5} - - {x: -1, y: 5.0000296} - - {x: -1.0000293, y: 6} - - {x: -3, y: 5.999971} - - {x: -3.0000293, y: 5} - - {x: -6, y: 4.999971} - - {x: -5.999971, y: 4} - - - {x: 9.99997, y: 1} - - {x: 9.99997, y: 2} - - {x: 8, y: 2.0000293} - - {x: 7.9999704, y: 3} - - {x: 7, y: 2.999971} - - {x: 6.9999704, y: 2} - - {x: 5, y: 1.9999708} - - {x: 5.000029, y: 1} - - - {x: -10.00003, y: 1} - - {x: -10.00003, y: 2} - - {x: -15, y: 1.9999708} - - {x: -14.999971, y: 1} - - - {x: 16.999971, y: -2} - - {x: 16.999971, y: 0} - - {x: 16, y: 0.0000294} - - {x: 15.999971, y: 1} - - {x: 14, y: 0.99997073} - - {x: 13.999971, y: 0} - - {x: 13, y: -0.000029300001} - - {x: 12.99997, y: -1} - - {x: 12, y: -1.0000293} - - {x: 12.00003, y: -2} - - - {x: 10.99997, y: -5} - - {x: 10.99997, y: -4} - - {x: 10, y: -3.9999704} - - {x: 9.99997, y: -2} - - {x: 8, y: -2.0000293} - - {x: 7.9999704, y: -3} - - {x: 7, y: -3.0000293} - - {x: 6.9999704, y: -4} - - {x: 5, y: -4.000029} - - {x: 5.000029, y: -5} - - - {x: 1.9999708, y: -3} - - {x: 1.9999708, y: -2} - - {x: -3, y: -2.0000293} - - {x: -2.999971, y: -3} - - - {x: -8.00003, y: -5} - - {x: -8.00003, y: -4} - - {x: -13, y: -4.000029} - - {x: -12.99997, y: -5} - m_VertexDistance: 0.0005 - m_OffsetDistance: 0.00005 - m_UseDelaunayMesh: 0 - m_CompositeGameObject: {fileID: 1490603789} --- !u!50 &1490603795 Rigidbody2D: serializedVersion: 4 @@ -12697,7 +12142,7 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1333310382} m_SourcePrefab: {fileID: -8435245712485981826, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} ---- !u!1001 &1566087841 +--- !u!1001 &1756254446 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -12709,10 +12154,6 @@ PrefabInstance: propertyPath: m_Name value: UI.InGameUI objectReference: {fileID: 0} - - target: {fileID: 2230928671015106332, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} propertyPath: m_Pivot.x value: 0 @@ -12793,14 +12234,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8380942775989975440, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 8519680420593009912, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_BlockingMask.m_Bits - value: 55 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -12850,130 +12283,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94c58e7fc0b907b43bbe208a18ca6ded, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1875681902 -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: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 900, g: 300, b: 80, a: 0} - m_BuildTextureStacks: [] ---- !u!1 &1960543494 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1960543496} - - component: {fileID: 1960543495} - m_Layer: 0 - m_Name: Attack_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1960543495 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1960543494} - 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: 1071925984, guid: 8c818873fb8d4ad3bb40ebb62d906a1d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 8, y: 8} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1960543496 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1960543494} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.46, y: -7.59, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1986734010 GameObject: m_ObjectHideFlags: 0 @@ -13146,309 +12455,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &158361764548879778 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1781236700806201943, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948625238841251670, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 1875681902} - - target: {fileID: 6480810126100203075, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} - propertyPath: m_Name - value: UI.GameWinUI - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f2f0d0db5ed4add458f86d9837e3dfa1, type: 3} ---- !u!1001 &2986312121139184983 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5830140097779826096, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8671327827710467541, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - propertyPath: m_Name - value: UI.PauseUI - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} ---- !u!1001 &3287116697728905861 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2608605410118548343, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 1095300152} - - target: {fileID: 2896585157172790074, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_Name - value: UI.GameOverUI - objectReference: {fileID: 0} - - target: {fileID: 2896585157172790074, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6219218969724791845, guid: 35811b3f508ecbe47b4217756860a036, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 35811b3f508ecbe47b4217756860a036, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -13462,8 +12468,5 @@ SceneRoots: - {fileID: 392344608} - {fileID: 1555992584} - {fileID: 257363990} - - {fileID: 1566087841} - - {fileID: 3287116697728905861} - - {fileID: 158361764548879778} - - {fileID: 2986312121139184983} - - {fileID: 1960543496} + - {fileID: 720822433} + - {fileID: 1756254446} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs index 2c01e73b..f2acde97 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs @@ -15,6 +15,11 @@ namespace TON ControllerUI, LobbyUI, LogUI, + + + GameOverUI, + GameWinUI, + PauseUI, PANEL_END, diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster.meta b/Gameton-06/Assets/Gameton/Scripts/Monster.meta new file mode 100644 index 00000000..99487e97 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Monster.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46e704a9011c5614792d9bace2317174 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs new file mode 100644 index 00000000..bac3748c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace TON +{ + public class PauseUI : UIBase + { + public void OnPressPause() + { + UIManager.Show(UIList.PauseUI); + Debug.Log("버튼 클릭"); + + Time.timeScale = 0f; + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs.meta new file mode 100644 index 00000000..04e37cdf --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94f5b0c2758d43b42a74f7fe4ae3a7e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: