diff --git a/Assets/Prefabs/Managers/GameManager.prefab b/Assets/Prefabs/Managers/GameManager.prefab index 539f2dd..3af0897 100644 --- a/Assets/Prefabs/Managers/GameManager.prefab +++ b/Assets/Prefabs/Managers/GameManager.prefab @@ -79,3 +79,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e64481d2e18e4b6ca4f22926a5061450, type: 3} m_Name: m_EditorClassIdentifier: + upgradePrefabs: + - {fileID: 4242909486338491383, guid: c0bd5085d71f847b19df326a2fbcf069, type: 3} + - {fileID: 7385886653159515755, guid: ba0e1f9d79914426ba805d871bcad311, type: 3} + - {fileID: 2377911311221568072, guid: 6d6a8eb6810cd4483a761f7b02fff67f, type: 3} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 1b87210..e6fb63b 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -110,7 +110,7 @@ GameObject: - component: {fileID: 6843575828445418654} - component: {fileID: 6843575828445418656} - component: {fileID: 6843575828445418653} - - component: {fileID: 1227801303} + - component: {fileID: 4496203914881469991} m_Layer: 15 m_Name: Player m_TagString: Untagged @@ -167,8 +167,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!58 &1227801303 -CircleCollider2D: +--- !u!60 &4496203914881469991 +PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -181,5 +181,19 @@ CircleCollider2D: m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.5, y: 0.5} - serializedVersion: 2 - m_Radius: 0.4 + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.04022324, y: 0.49737525} + - {x: -0.35441214, y: 0.48326027} + - {x: -0.2592954, y: -0.12544739} + - {x: 0.3062232, y: -0.12544727} + - {x: 0.3678198, y: 0.48996192} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f91cee4..9827f66 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -404,7 +404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 13.828903, y: -4.0430503, z: -10} + m_LocalPosition: {x: 13.938327, y: -4.0430503, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -597,16 +597,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2152024136797500473, guid: 1f5ebc13237e070449ea8bc9e8b07ac8, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2152024136797500473, guid: 1f5ebc13237e070449ea8bc9e8b07ac8, - type: 3} - propertyPath: m_PixelPerfect - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4935993846136593301, guid: 1f5ebc13237e070449ea8bc9e8b07ac8, type: 3} propertyPath: m_Text @@ -701,29 +691,6 @@ PrefabInstance: propertyPath: m_Name value: GameManager objectReference: {fileID: 0} - - target: {fileID: 6316647355651322741, guid: fdaa7451ab31b477b930076bbc888bab, - type: 3} - propertyPath: upgradePrefabs.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6316647355651322741, guid: fdaa7451ab31b477b930076bbc888bab, - type: 3} - propertyPath: upgradePrefabs.Array.data[0] - value: - objectReference: {fileID: 4242909486338491383, guid: c0bd5085d71f847b19df326a2fbcf069, - type: 3} - - target: {fileID: 6316647355651322741, guid: fdaa7451ab31b477b930076bbc888bab, - type: 3} - propertyPath: upgradePrefabs.Array.data[1] - value: - objectReference: {fileID: 7385886653159515755, guid: ba0e1f9d79914426ba805d871bcad311, - type: 3} - - target: {fileID: 6316647355651322741, guid: fdaa7451ab31b477b930076bbc888bab, - type: 3} - propertyPath: upgradePrefabs.Array.data[2] - value: - objectReference: {fileID: 2377911311221568072, guid: 6d6a8eb6810cd4483a761f7b02fff67f, - type: 3} - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/src/Managers/GameManager.cs b/Assets/Scripts/src/Managers/GameManager.cs index d43d6f3..47db7ef 100644 --- a/Assets/Scripts/src/Managers/GameManager.cs +++ b/Assets/Scripts/src/Managers/GameManager.cs @@ -55,7 +55,7 @@ namespace src.Managers private IEnumerator PreInitGame() { _preStageUi.SetActive(true); - yield return new WaitForSeconds(0.7f); + yield return new WaitForSeconds(1f); _preStageUi.SetActive(false); }