diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity index d9c12c8c..e10dded9 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity @@ -2212,74 +2212,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &257363987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 257363990} - - component: {fileID: 257363989} - - component: {fileID: 257363988} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &257363988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &257363989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &257363990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &265027070 GameObject: m_ObjectHideFlags: 3 @@ -95266,5 +95198,4 @@ SceneRoots: - {fileID: 535565209} - {fileID: 2067632268} - {fileID: 1555992584} - - {fileID: 257363990} - {fileID: 1423029865} diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity index 7279255b..54e0ca89 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity @@ -194,7 +194,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -2 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -1707,7 +1707,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 410 - m_TileSpriteIndex: 324 + m_TileSpriteIndex: 331 m_TileMatrixIndex: 2 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -1727,7 +1727,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 409 - m_TileSpriteIndex: 323 + m_TileSpriteIndex: 330 m_TileMatrixIndex: 0 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -1757,7 +1757,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 407 - m_TileSpriteIndex: 321 + m_TileSpriteIndex: 329 m_TileMatrixIndex: 1 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -4038,14 +4038,14 @@ Tilemap: m_Data: {fileID: -230938450, guid: d42ce008c026e8e4eb5894cbe7acc91a, type: 3} - m_RefCount: 3 m_Data: {fileID: -23788379, guid: d42ce008c026e8e4eb5894cbe7acc91a, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 491725776, guid: cea707fb0b020984797056f0931e347b, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 1929721031, guid: cea707fb0b020984797056f0931e347b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -1284161285, guid: cea707fb0b020984797056f0931e347b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 2124850586, guid: cea707fb0b020984797056f0931e347b, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: -1103269693, guid: cea707fb0b020984797056f0931e347b, type: 3} - m_RefCount: 2 @@ -4054,12 +4054,12 @@ Tilemap: m_Data: {fileID: -1112756256, guid: cea707fb0b020984797056f0931e347b, type: 3} - m_RefCount: 1 m_Data: {fileID: 1301567577, guid: cea707fb0b020984797056f0931e347b, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 491725776, guid: cea707fb0b020984797056f0931e347b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1284161285, guid: cea707fb0b020984797056f0931e347b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2124850586, guid: cea707fb0b020984797056f0931e347b, type: 3} - m_RefCount: 7 m_Data: {fileID: 1911422594, guid: cea707fb0b020984797056f0931e347b, type: 3} - m_RefCount: 30 @@ -4630,7 +4630,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -3 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -7196,74 +7196,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &257363987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 257363990} - - component: {fileID: 257363989} - - component: {fileID: 257363988} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &257363988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &257363989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &257363990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &265027070 GameObject: m_ObjectHideFlags: 3 @@ -7615,7 +7547,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -4 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -53359,7 +53291,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -1 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -56838,7 +56770,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -156273,7 +156205,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -3 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -164047,7 +163979,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -3 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -171155,7 +171087,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -488497253 - m_SortingLayer: 1 + m_SortingLayer: 0 m_SortingOrder: -2 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -179642,4 +179574,3 @@ SceneRoots: - {fileID: 535565209} - {fileID: 2067632268} - {fileID: 1355096343} - - {fileID: 257363990} diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity index bed66f0e..eb6de078 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity @@ -24479,74 +24479,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} ---- !u!1 &257363987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 257363990} - - component: {fileID: 257363989} - - component: {fileID: 257363988} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &257363988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &257363989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &257363990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257363987} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &265027070 GameObject: m_ObjectHideFlags: 3 @@ -49529,7 +49461,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 391 - m_TileSpriteIndex: 143 + m_TileSpriteIndex: 145 m_TileMatrixIndex: 2 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -50419,7 +50351,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 387 - m_TileSpriteIndex: 142 + m_TileSpriteIndex: 144 m_TileMatrixIndex: 4 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -50429,7 +50361,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 386 - m_TileSpriteIndex: 141 + m_TileSpriteIndex: 143 m_TileMatrixIndex: 0 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -50439,7 +50371,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 385 - m_TileSpriteIndex: 140 + m_TileSpriteIndex: 142 m_TileMatrixIndex: 0 m_TileColorIndex: 177 m_TileObjectToInstantiateIndex: 65535 @@ -53118,6 +53050,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 1260579597, guid: 76fa8be48da57814ea137aeb42116019, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1707290379, guid: 7bcaa1e1bdf9650468ce265ab35d4b10, type: 3} - m_RefCount: 1 @@ -53126,10 +53062,6 @@ Tilemap: m_Data: {fileID: 207345875, guid: 7bcaa1e1bdf9650468ce265ab35d4b10, type: 3} - m_RefCount: 1 m_Data: {fileID: 480513479, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_RefCount: 4 m_Data: {fileID: -1540320896, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - m_RefCount: 4 @@ -57270,5 +57202,4 @@ SceneRoots: - {fileID: 2135657552} - {fileID: 535565209} - {fileID: 2067632268} - - {fileID: 257363990} - {fileID: 212913069} diff --git a/Gameton-06/ProjectSettings/EditorBuildSettings.asset b/Gameton-06/ProjectSettings/EditorBuildSettings.asset index ed5d1d5f..fe84a6a6 100644 --- a/Gameton-06/ProjectSettings/EditorBuildSettings.asset +++ b/Gameton-06/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a769e65e632b0e21ab0c04cb10c85dd829739817685280e202da07a19cedd8c6 -size 667 +oid sha256:0f086f9a7e956dd08d03d38ed17f0f533e8f6b8dfe1f72072a11198069a4b2fa +size 980