From 3ae454cf7fa7c410f3003f96b6ad7d88f4e1ccc1 Mon Sep 17 00:00:00 2001 From: nuruznaeem198 Date: Thu, 26 Sep 2024 15:38:53 +0500 Subject: [PATCH] infinite levels added --- .../BulletMuzzle/BulletMuzzleGreen.prefab | 6 +- .../BestFonts/_DefaultFont_Turorials.asset | 105 +++- Assets/ParticleController.cs | 2 +- Assets/Prefabs/Core/Swipe To Play.prefab | 9 +- .../Core/UI/OldStyle/NextButton.prefab | 40 +- .../Core/UI/OldStyle/ReplayButton.prefab | 45 +- Assets/Prefabs/Core/UI/Popup.prefab | 1 - Assets/Prefabs/Core/UI/Popup_Fast.prefab | 178 +++--- Assets/Prefabs/Core/UI/Popup_Long.prefab | 13 + Assets/Prefabs/ForTutorial/ClickFast.prefab | 3 - Assets/Scenes/Level_1.unity | 556 +++++++++++------- .../2048/Neutral Members/neutralMysto.prefab | 2 +- .../2048/Neutral Members/neutralWizard.prefab | 2 +- .../Prefabs/Projectiles/Pistol Bullet.prefab | 6 - Assets/Source/Scripts/GameProgress.cs | 12 +- Assets/Source/Scripts/GameProgress1.cs | 18 + Assets/Source/Scripts/GameProgress1.cs.meta | 11 + Assets/Source/Scripts/SO/Levels/LevelSO.cs | 2 +- .../Scripts/SO/Levels/infiniteLevel.asset | 24 + .../SO/Levels/infiniteLevel.asset.meta | 8 + .../Member Upgrades/MemberUpgrades.cs | 9 +- .../Member Upgrades/Pistol Upgrade.asset | 4 +- Assets/muzzleController.cs | 21 + Assets/muzzleController.cs.meta | 11 + hs_err_pid20196.log | 197 +++++++ hs_err_pid21556.log | 198 +++++++ hs_err_pid22312.log | 195 ++++++ 27 files changed, 1362 insertions(+), 316 deletions(-) create mode 100644 Assets/Source/Scripts/GameProgress1.cs create mode 100644 Assets/Source/Scripts/GameProgress1.cs.meta create mode 100644 Assets/Source/Scripts/SO/Levels/infiniteLevel.asset create mode 100644 Assets/Source/Scripts/SO/Levels/infiniteLevel.asset.meta create mode 100644 Assets/muzzleController.cs create mode 100644 Assets/muzzleController.cs.meta create mode 100644 hs_err_pid20196.log create mode 100644 hs_err_pid21556.log create mode 100644 hs_err_pid22312.log diff --git a/Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/BulletMuzzle/BulletMuzzleGreen.prefab b/Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/BulletMuzzle/BulletMuzzleGreen.prefab index 4053a991..11da1c87 100644 --- a/Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/BulletMuzzle/BulletMuzzleGreen.prefab +++ b/Assets/Epic Toon FX/Prefabs/Combat/Muzzleflash/BulletMuzzle/BulletMuzzleGreen.prefab @@ -9716,12 +9716,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144156} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8f9ae6be06d449d4cbd874bc1bedd92a, type: 3} m_Name: m_EditorClassIdentifier: - projectileParticles: [] + projectileParticles: + - {fileID: 0} + - {fileID: 0} impactParticles: [] muzzleParticles: - {fileID: 3135715745933589058} diff --git a/Assets/Other/Fonts/BestFonts/_DefaultFont_Turorials.asset b/Assets/Other/Fonts/BestFonts/_DefaultFont_Turorials.asset index 87a71af0..db77feb4 100644 --- a/Assets/Other/Fonts/BestFonts/_DefaultFont_Turorials.asset +++ b/Assets/Other/Fonts/BestFonts/_DefaultFont_Turorials.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -73,6 +74,7 @@ MonoBehaviour: m_StyleName: Black m_PointSize: 65 m_Scale: 1 + m_UnitsPerEM: 0 m_LineHeight: 88.4 m_AscentLine: 66.625 m_CapLine: 46 @@ -103,6 +105,7 @@ MonoBehaviour: m_Height: 0 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 2 m_Metrics: m_Width: 14.109375 @@ -117,6 +120,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 3 m_Metrics: m_Width: 23.078125 @@ -131,6 +135,7 @@ MonoBehaviour: m_Height: 17 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 4 m_Metrics: m_Width: 46.203125 @@ -145,6 +150,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 5 m_Metrics: m_Width: 30.625 @@ -159,6 +165,7 @@ MonoBehaviour: m_Height: 54 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 6 m_Metrics: m_Width: 47.65625 @@ -173,6 +180,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 7 m_Metrics: m_Width: 39.140625 @@ -187,6 +195,7 @@ MonoBehaviour: m_Height: 51 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 8 m_Metrics: m_Width: 10.796875 @@ -201,6 +210,7 @@ MonoBehaviour: m_Height: 17 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 9 m_Metrics: m_Width: 22.609375 @@ -215,6 +225,7 @@ MonoBehaviour: m_Height: 54 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 10 m_Metrics: m_Width: 22.625 @@ -229,6 +240,7 @@ MonoBehaviour: m_Height: 54 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 11 m_Metrics: m_Width: 30.546875 @@ -243,6 +255,7 @@ MonoBehaviour: m_Height: 31 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 12 m_Metrics: m_Width: 33.265625 @@ -257,6 +270,7 @@ MonoBehaviour: m_Height: 33 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 13 m_Metrics: m_Width: 14.890625 @@ -271,6 +285,7 @@ MonoBehaviour: m_Height: 19 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 14 m_Metrics: m_Width: 33.265625 @@ -285,6 +300,7 @@ MonoBehaviour: m_Height: 14 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 15 m_Metrics: m_Width: 13.96875 @@ -299,6 +315,7 @@ MonoBehaviour: m_Height: 15 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 16 m_Metrics: m_Width: 28.609375 @@ -313,6 +330,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 17 m_Metrics: m_Width: 36.59375 @@ -327,6 +345,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 18 m_Metrics: m_Width: 27.5 @@ -341,6 +360,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 19 m_Metrics: m_Width: 33.34375 @@ -355,6 +375,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 20 m_Metrics: m_Width: 33.671875 @@ -369,6 +390,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 21 m_Metrics: m_Width: 38.421875 @@ -383,6 +405,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 22 m_Metrics: m_Width: 31.015625 @@ -397,6 +420,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 23 m_Metrics: m_Width: 34.375 @@ -411,6 +435,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 24 m_Metrics: m_Width: 31.984375 @@ -425,6 +450,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 25 m_Metrics: m_Width: 35.296875 @@ -439,6 +465,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 26 m_Metrics: m_Width: 34.375 @@ -453,6 +480,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 27 m_Metrics: m_Width: 13.96875 @@ -467,6 +495,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 28 m_Metrics: m_Width: 15.015625 @@ -481,6 +510,7 @@ MonoBehaviour: m_Height: 42 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 29 m_Metrics: m_Width: 32.6875 @@ -495,6 +525,7 @@ MonoBehaviour: m_Height: 54 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 30 m_Metrics: m_Width: 33.265625 @@ -509,6 +540,7 @@ MonoBehaviour: m_Height: 30 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 31 m_Metrics: m_Width: 32.6875 @@ -523,6 +555,7 @@ MonoBehaviour: m_Height: 54 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 32 m_Metrics: m_Width: 33.015625 @@ -537,6 +570,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 33 m_Metrics: m_Width: 52.90625 @@ -551,6 +585,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 34 m_Metrics: m_Width: 44.53125 @@ -565,6 +600,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 35 m_Metrics: m_Width: 36.203125 @@ -579,6 +615,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 36 m_Metrics: m_Width: 35.234375 @@ -593,6 +630,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 37 m_Metrics: m_Width: 36.78125 @@ -607,6 +645,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 38 m_Metrics: m_Width: 32.03125 @@ -621,6 +660,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 39 m_Metrics: m_Width: 31.40625 @@ -635,6 +675,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 40 m_Metrics: m_Width: 41.015625 @@ -649,6 +690,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 41 m_Metrics: m_Width: 37.703125 @@ -663,6 +705,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 42 m_Metrics: m_Width: 15.015625 @@ -677,6 +720,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 43 m_Metrics: m_Width: 36.59375 @@ -691,6 +735,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 44 m_Metrics: m_Width: 37.515625 @@ -705,6 +750,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 45 m_Metrics: m_Width: 32.640625 @@ -719,6 +765,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 46 m_Metrics: m_Width: 52.265625 @@ -733,6 +780,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 47 m_Metrics: m_Width: 39.0625 @@ -747,6 +795,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 48 m_Metrics: m_Width: 43.9375 @@ -761,6 +810,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 49 m_Metrics: m_Width: 36.84375 @@ -775,6 +825,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 50 m_Metrics: m_Width: 43.9375 @@ -789,6 +840,7 @@ MonoBehaviour: m_Height: 57 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 51 m_Metrics: m_Width: 35.671875 @@ -803,6 +855,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 52 m_Metrics: m_Width: 33.40625 @@ -817,6 +870,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 53 m_Metrics: m_Width: 40.421875 @@ -831,6 +885,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 54 m_Metrics: m_Width: 37.96875 @@ -845,6 +900,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 55 m_Metrics: m_Width: 45.5625 @@ -859,6 +915,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 56 m_Metrics: m_Width: 55.4375 @@ -873,6 +930,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 57 m_Metrics: m_Width: 46.03125 @@ -887,6 +945,7 @@ MonoBehaviour: m_Height: 51 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 58 m_Metrics: m_Width: 46.921875 @@ -901,6 +960,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 59 m_Metrics: m_Width: 40.109375 @@ -915,6 +975,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 60 m_Metrics: m_Width: 21.78125 @@ -929,6 +990,7 @@ MonoBehaviour: m_Height: 57 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 61 m_Metrics: m_Width: 57.390625 @@ -943,6 +1005,7 @@ MonoBehaviour: m_Height: 45 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 62 m_Metrics: m_Width: 21.125 @@ -957,6 +1020,7 @@ MonoBehaviour: m_Height: 57 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 63 m_Metrics: m_Width: 28.34375 @@ -971,6 +1035,7 @@ MonoBehaviour: m_Height: 25 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 64 m_Metrics: m_Width: 31.984375 @@ -985,6 +1050,7 @@ MonoBehaviour: m_Height: 13 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 65 m_Metrics: m_Width: 16.3125 @@ -999,6 +1065,7 @@ MonoBehaviour: m_Height: 18 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 66 m_Metrics: m_Width: 32.5 @@ -1013,6 +1080,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 67 m_Metrics: m_Width: 33.140625 @@ -1027,6 +1095,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 68 m_Metrics: m_Width: 27.75 @@ -1041,6 +1110,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 69 m_Metrics: m_Width: 33.15625 @@ -1055,6 +1125,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 70 m_Metrics: m_Width: 34.96875 @@ -1069,6 +1140,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 71 m_Metrics: m_Width: 30.28125 @@ -1083,6 +1155,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 72 m_Metrics: m_Width: 34.453125 @@ -1097,6 +1170,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 73 m_Metrics: m_Width: 34.3125 @@ -1111,6 +1185,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 74 m_Metrics: m_Width: 14.828125 @@ -1125,6 +1200,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 75 m_Metrics: m_Width: 21.1875 @@ -1139,6 +1215,7 @@ MonoBehaviour: m_Height: 63 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 76 m_Metrics: m_Width: 32.953125 @@ -1153,6 +1230,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 77 m_Metrics: m_Width: 13.96875 @@ -1167,6 +1245,7 @@ MonoBehaviour: m_Height: 48 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 78 m_Metrics: m_Width: 47.125 @@ -1181,6 +1260,7 @@ MonoBehaviour: m_Height: 37 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 79 m_Metrics: m_Width: 34.3125 @@ -1195,6 +1275,7 @@ MonoBehaviour: m_Height: 37 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 80 m_Metrics: m_Width: 34.328125 @@ -1209,6 +1290,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 81 m_Metrics: m_Width: 33.140625 @@ -1223,6 +1305,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 82 m_Metrics: m_Width: 33.15625 @@ -1237,6 +1320,7 @@ MonoBehaviour: m_Height: 50 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 83 m_Metrics: m_Width: 26.328125 @@ -1251,6 +1335,7 @@ MonoBehaviour: m_Height: 37 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 84 m_Metrics: m_Width: 29.3125 @@ -1265,6 +1350,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 85 m_Metrics: m_Width: 27.75 @@ -1279,6 +1365,7 @@ MonoBehaviour: m_Height: 49 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 86 m_Metrics: m_Width: 34.640625 @@ -1293,6 +1380,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 87 m_Metrics: m_Width: 36.0625 @@ -1307,6 +1395,7 @@ MonoBehaviour: m_Height: 38 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 88 m_Metrics: m_Width: 49.390625 @@ -1321,6 +1410,7 @@ MonoBehaviour: m_Height: 37 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 89 m_Metrics: m_Width: 35.75 @@ -1335,6 +1425,7 @@ MonoBehaviour: m_Height: 39 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 90 m_Metrics: m_Width: 37.5 @@ -1349,6 +1440,7 @@ MonoBehaviour: m_Height: 53 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 91 m_Metrics: m_Width: 32.421875 @@ -1363,6 +1455,7 @@ MonoBehaviour: m_Height: 37 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 92 m_Metrics: m_Width: 27.890625 @@ -1377,6 +1470,7 @@ MonoBehaviour: m_Height: 59 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 93 m_Metrics: m_Width: 14.953125 @@ -1391,6 +1485,7 @@ MonoBehaviour: m_Height: 57 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 94 m_Metrics: m_Width: 27.890625 @@ -1405,6 +1500,7 @@ MonoBehaviour: m_Height: 59 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 95 m_Metrics: m_Width: 41.078125 @@ -1419,6 +1515,7 @@ MonoBehaviour: m_Height: 21 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 106 m_Metrics: m_Width: 51.296875 @@ -1433,6 +1530,7 @@ MonoBehaviour: m_Height: 15 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 m_Unicode: 32 @@ -2601,6 +2699,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: CookieRun Black SDF Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -2609,6 +2709,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -2663,7 +2764,7 @@ Material: - _Reflectivity: 10 - _ScaleRatioA: 0.8333333 - _ScaleRatioB: 0.6770833 - - _ScaleRatioC: 0.29197213 + - _ScaleRatioC: 0.2919721 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 diff --git a/Assets/ParticleController.cs b/Assets/ParticleController.cs index de162632..5d9b1151 100644 --- a/Assets/ParticleController.cs +++ b/Assets/ParticleController.cs @@ -11,7 +11,7 @@ public class ParticleController : MonoBehaviour void Start() { index = PlayerPrefs.GetInt("selectedCharacterIndex"); - // Debug.Log("index is" + index); + Debug.Log("index is" + index); enableprojectileParticles(index); //enableimpactParticles(index); //enablemuzzleParticles(index); diff --git a/Assets/Prefabs/Core/Swipe To Play.prefab b/Assets/Prefabs/Core/Swipe To Play.prefab index e3e20466..6251015e 100644 --- a/Assets/Prefabs/Core/Swipe To Play.prefab +++ b/Assets/Prefabs/Core/Swipe To Play.prefab @@ -34,7 +34,6 @@ RectTransform: - {fileID: 7668642093374255343} - {fileID: 7668642094393019264} m_Father: {fileID: 7668642093746538189} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -159,7 +158,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7668642093244235408} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -206,7 +204,7 @@ MonoBehaviour: m_PixelsPerUnitMultiplier: 1 --- !u!95 &7668642093374255341 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -223,7 +221,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7668642093746538190 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +255,6 @@ RectTransform: m_Children: - {fileID: 7668642093244235408} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -315,7 +313,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7668642093244235408} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/Core/UI/OldStyle/NextButton.prefab b/Assets/Prefabs/Core/UI/OldStyle/NextButton.prefab index d256bfba..2d77cd31 100644 --- a/Assets/Prefabs/Core/UI/OldStyle/NextButton.prefab +++ b/Assets/Prefabs/Core/UI/OldStyle/NextButton.prefab @@ -29,9 +29,9 @@ RectTransform: 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: 6915988078012362783} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -92,17 +92,38 @@ MonoBehaviour: to: 0.6 _duration: {x: 0.5, y: 0.5} duration: 0.7 - _delayBetweenCycles: {x: 0, y: 0} + _durationData: {fileID: 0} _startDelay: {x: 0, y: 0} - delayBetweenCycles: 0 startDelay: 0 - _isPong: 1 + _delayBetweenYoyo: {x: 0, y: 0} + delayBetweenYoyo: 0 + _delayBetweenCycles: {x: 0, y: 0} + delayBetweenCycles: 0 + _loops: 1 _isRelative: 0 _destroyOnFinish: 0 _ease: 1 _playMode: 0 + _onComplete: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isFrom: 0 + _isLocal: 0 isRandomnessSupported: 0 isAdvancedInfoVisible: 0 + isOnCompleteVisible: 0 + isDurationDataMode: 0 + _isPlayingInEditor: 0 + isTargetVisibleInEditor: 0 + beforePlayPosition: {x: 0, y: 0, z: 0} + beforePlayRotation: {x: 0, y: 0, z: 0} + beforePlayScale: {x: 0, y: 0, z: 0} + isIncremental: 0 + _target: {fileID: 0} --- !u!1 &1573160678563407304 GameObject: m_ObjectHideFlags: 0 @@ -131,9 +152,9 @@ RectTransform: 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: 6915988078012362783} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -245,6 +266,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_CornerGradientColors: @@ -281,9 +303,9 @@ RectTransform: 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: 6915988078012362783} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -395,6 +417,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_CornerGradientColors: @@ -434,13 +457,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8142493037247171454} - {fileID: 1641585074109068239} - {fileID: 1166122788529850589} - {fileID: 6471892510591871773} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -539,6 +562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 308c34e54d44242ffb9bd4dc2339d42d, type: 3} m_Name: m_EditorClassIdentifier: + _isButton: 0 --- !u!1 &8708833251471743653 GameObject: m_ObjectHideFlags: 0 @@ -567,9 +591,9 @@ RectTransform: 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: 6915988078012362783} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/Core/UI/OldStyle/ReplayButton.prefab b/Assets/Prefabs/Core/UI/OldStyle/ReplayButton.prefab index c2670aa5..375b55b0 100644 --- a/Assets/Prefabs/Core/UI/OldStyle/ReplayButton.prefab +++ b/Assets/Prefabs/Core/UI/OldStyle/ReplayButton.prefab @@ -28,9 +28,9 @@ RectTransform: 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: 4991966009631772524} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -142,6 +142,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_CornerGradientColors: @@ -178,9 +179,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -1, w: -0.00000031292436} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4991966009631772524} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -292,6 +293,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_CornerGradientColors: @@ -329,9 +331,9 @@ RectTransform: 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: 4991966009631772524} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -392,17 +394,38 @@ MonoBehaviour: to: 0.6 _duration: {x: 0.5, y: 0.5} duration: 0.7 - _delayBetweenCycles: {x: 0, y: 0} + _durationData: {fileID: 0} _startDelay: {x: 0, y: 0} - delayBetweenCycles: 0 startDelay: 0 - _isPong: 1 + _delayBetweenYoyo: {x: 0, y: 0} + delayBetweenYoyo: 0 + _delayBetweenCycles: {x: 0, y: 0} + delayBetweenCycles: 0 + _loops: 1 _isRelative: 0 _destroyOnFinish: 0 _ease: 1 _playMode: 0 + _onComplete: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isFrom: 0 + _isLocal: 0 isRandomnessSupported: 0 isAdvancedInfoVisible: 0 + isOnCompleteVisible: 0 + isDurationDataMode: 0 + _isPlayingInEditor: 0 + isTargetVisibleInEditor: 0 + beforePlayPosition: {x: 0, y: 0, z: 0} + beforePlayRotation: {x: 0, y: 0, z: 0} + beforePlayScale: {x: 0, y: 0, z: 0} + isIncremental: 0 + _target: {fileID: 0} --- !u!1 &3479051156859909430 GameObject: m_ObjectHideFlags: 0 @@ -431,9 +454,9 @@ RectTransform: 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: 4991966009631772524} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -545,6 +568,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_CornerGradientColors: @@ -581,9 +605,9 @@ RectTransform: 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: 4991966009631772524} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -656,9 +680,9 @@ RectTransform: 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: 4991966009631772524} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -754,6 +778,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2318701651503067322} - {fileID: 1483701052992431886} @@ -762,7 +787,6 @@ RectTransform: - {fileID: 2101136661002926843} - {fileID: 7559975572178674491} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -861,3 +885,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c3da377e1222a4ba087d905ac56a2b3c, type: 3} m_Name: m_EditorClassIdentifier: + _isButton: 0 diff --git a/Assets/Prefabs/Core/UI/Popup.prefab b/Assets/Prefabs/Core/UI/Popup.prefab index fc06e1b5..bbfdedf3 100644 --- a/Assets/Prefabs/Core/UI/Popup.prefab +++ b/Assets/Prefabs/Core/UI/Popup.prefab @@ -34,7 +34,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/Core/UI/Popup_Fast.prefab b/Assets/Prefabs/Core/UI/Popup_Fast.prefab index 06f928f6..c17342c7 100644 --- a/Assets/Prefabs/Core/UI/Popup_Fast.prefab +++ b/Assets/Prefabs/Core/UI/Popup_Fast.prefab @@ -1,79 +1,11 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &1730864106 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3394345543892227880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1e84f9535af44b69b95134fa771197f, type: 3} - m_Name: - m_EditorClassIdentifier: - _to: {x: 1, y: 1} - to: 0.4 - _duration: {x: 0.5, y: 0.5} - duration: 0.5 - _durationData: {fileID: 0} - _startDelay: {x: 0, y: 0} - startDelay: 0 - _delayBetweenYoyo: {x: 0, y: 0} - delayBetweenYoyo: 0.1 - _delayBetweenCycles: {x: 0, y: 0} - delayBetweenCycles: 0 - _loops: 1 - _isRelative: 0 - _destroyOnFinish: 0 - _ease: 4 - _playMode: 0 - _onComplete: [] - isRandomnessSupported: 0 - isAdvancedInfoVisible: 0 - isOnCompleteVisible: 0 - isDurationDataMode: 0 - _isPunchUI: 0 - _vibratio: 0 - _elasity: 0 ---- !u!114 &1730864107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3394345543892227880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5038c1b4bb5e460982d9bebfa9d5916a, type: 3} - m_Name: - m_EditorClassIdentifier: - _to: {x: 1, y: 1} - to: 1 - _duration: {x: 0.5, y: 0.5} - duration: 0.3 - _durationData: {fileID: 0} - _startDelay: {x: 0, y: 0} - startDelay: 0 - _delayBetweenYoyo: {x: 0, y: 0} - delayBetweenYoyo: 0.2 - _delayBetweenCycles: {x: 0, y: 0} - delayBetweenCycles: 0 - _loops: 2 - _isRelative: 0 - _destroyOnFinish: 1 - _ease: 4 - _playMode: 0 - _onComplete: [] - isRandomnessSupported: 0 - isAdvancedInfoVisible: 1 - isOnCompleteVisible: 0 - isDurationDataMode: 0 --- !u!1001 &6211419810086790108 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 8730304988018668785, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} @@ -194,9 +126,117 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8730304988018668786, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + insertIndex: -1 + addedObject: {fileID: 1730864106} + - targetCorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + insertIndex: -1 + addedObject: {fileID: 1730864107} m_SourcePrefab: {fileID: 100100000, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} --- !u!1 &3394345543892227880 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} m_PrefabInstance: {fileID: 6211419810086790108} m_PrefabAsset: {fileID: 0} +--- !u!114 &1730864106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3394345543892227880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1e84f9535af44b69b95134fa771197f, type: 3} + m_Name: + m_EditorClassIdentifier: + _to: {x: 1, y: 1} + to: 0.4 + _duration: {x: 0.5, y: 0.5} + duration: 0.5 + _durationData: {fileID: 0} + _startDelay: {x: 0, y: 0} + startDelay: 0 + _delayBetweenYoyo: {x: 0, y: 0} + delayBetweenYoyo: 0.1 + _delayBetweenCycles: {x: 0, y: 0} + delayBetweenCycles: 0 + _loops: 1 + _isRelative: 0 + _destroyOnFinish: 0 + _ease: 4 + _playMode: 0 + _onComplete: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isFrom: 0 + _isLocal: 0 + isRandomnessSupported: 0 + isAdvancedInfoVisible: 0 + isOnCompleteVisible: 0 + isDurationDataMode: 0 + _isPlayingInEditor: 0 + isTargetVisibleInEditor: 0 + beforePlayPosition: {x: 0, y: 0, z: 0} + beforePlayRotation: {x: 0, y: 0, z: 0} + beforePlayScale: {x: 0, y: 0, z: 0} + isIncremental: 0 + _target: {fileID: 0} + _isPunchUI: 0 + _vibratio: 0 + _elasity: 0 +--- !u!114 &1730864107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3394345543892227880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5038c1b4bb5e460982d9bebfa9d5916a, type: 3} + m_Name: + m_EditorClassIdentifier: + _to: {x: 1, y: 1} + to: 1 + _duration: {x: 0.5, y: 0.5} + duration: 0.3 + _durationData: {fileID: 0} + _startDelay: {x: 0, y: 0} + startDelay: 0 + _delayBetweenYoyo: {x: 0, y: 0} + delayBetweenYoyo: 0.2 + _delayBetweenCycles: {x: 0, y: 0} + delayBetweenCycles: 0 + _loops: 2 + _isRelative: 0 + _destroyOnFinish: 1 + _ease: 4 + _playMode: 0 + _onComplete: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isFrom: 0 + _isLocal: 0 + isRandomnessSupported: 0 + isAdvancedInfoVisible: 1 + isOnCompleteVisible: 0 + isDurationDataMode: 0 + _isPlayingInEditor: 0 + isTargetVisibleInEditor: 0 + beforePlayPosition: {x: 0, y: 0, z: 0} + beforePlayRotation: {x: 0, y: 0, z: 0} + beforePlayScale: {x: 0, y: 0, z: 0} + isIncremental: 0 + _target: {fileID: 0} diff --git a/Assets/Prefabs/Core/UI/Popup_Long.prefab b/Assets/Prefabs/Core/UI/Popup_Long.prefab index da256d29..1fb55fab 100644 --- a/Assets/Prefabs/Core/UI/Popup_Long.prefab +++ b/Assets/Prefabs/Core/UI/Popup_Long.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 8730304988018668785, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} @@ -153,6 +154,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8730304988018668786, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + insertIndex: -1 + addedObject: {fileID: 514297185} + - targetCorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + insertIndex: -1 + addedObject: {fileID: 514297189} + - targetCorrespondingSourceObject: {fileID: 8730304988018668788, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} + insertIndex: -1 + addedObject: {fileID: 514297190} m_SourcePrefab: {fileID: 100100000, guid: d42d96494a7b64a9fb8fdc4f061d3c60, type: 3} --- !u!1 &2307519089623748055 stripped GameObject: diff --git a/Assets/Prefabs/ForTutorial/ClickFast.prefab b/Assets/Prefabs/ForTutorial/ClickFast.prefab index f6904dd0..c1415a71 100644 --- a/Assets/Prefabs/ForTutorial/ClickFast.prefab +++ b/Assets/Prefabs/ForTutorial/ClickFast.prefab @@ -33,7 +33,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7930746465621424883} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -206,7 +205,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7930746465621424883} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -389,7 +387,6 @@ RectTransform: - {fileID: 6055362621068911268} - {fileID: 450035028887267830} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 199f7c53..444187a9 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -277,7 +277,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.01129, y: -150.85625} + m_AnchoredPosition: {x: 60.011284, y: -150.85625} m_SizeDelta: {x: 111.95291, y: 22.5157} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8795440 @@ -1169,7 +1169,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: -43, y: -1475.5071} + m_AnchoredPosition: {x: -43, y: -1475.5068} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &41053418 @@ -2716,7 +2716,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &132478590 RectTransform: m_ObjectHideFlags: 0 @@ -2973,7 +2973,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &144410318 RectTransform: m_ObjectHideFlags: 0 @@ -3278,8 +3278,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &155578347 MonoBehaviour: @@ -3302,11 +3302,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -3446,7 +3446,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &159502467 RectTransform: m_ObjectHideFlags: 0 @@ -4119,7 +4119,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: -288.66, y: 1497.1118} + m_AnchoredPosition: {x: -288.66, y: 1497.1117} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &179610788 @@ -5002,7 +5002,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: 138.40002, y: 196.49377} + m_AnchoredPosition: {x: 138.40002, y: 196.49365} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &204494219 @@ -5756,8 +5756,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &249883986 MonoBehaviour: @@ -5780,11 +5780,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -6015,7 +6015,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &255390689 RectTransform: m_ObjectHideFlags: 0 @@ -6271,6 +6271,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 1908241524} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 0 --- !u!114 &263006095 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6344,7 +6356,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: -198, y: 523.87537} + m_AnchoredPosition: {x: -198, y: 523.87524} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &265051831 @@ -6488,7 +6500,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: 138.40002, y: -472.50635} + m_AnchoredPosition: {x: 138.40002, y: -472.50598} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &277296491 @@ -7637,7 +7649,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &331774114 RectTransform: m_ObjectHideFlags: 0 @@ -8146,7 +8158,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &354068412 RectTransform: m_ObjectHideFlags: 0 @@ -8458,8 +8470,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &368023363 MonoBehaviour: @@ -8482,11 +8494,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -8538,7 +8550,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: 296, y: 523.87537} + m_AnchoredPosition: {x: 296, y: 523.87524} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &371738806 @@ -9570,7 +9582,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &426892050 RectTransform: m_ObjectHideFlags: 0 @@ -10430,8 +10442,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &487120989 MonoBehaviour: @@ -10454,11 +10466,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -10840,7 +10852,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: -288.66, y: 196.49377} + m_AnchoredPosition: {x: -288.66, y: 196.49365} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &500193413 @@ -10947,7 +10959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.01129, y: -150.85625} + m_AnchoredPosition: {x: 60.011284, y: -150.85625} m_SizeDelta: {x: 111.95291, y: 22.5157} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &503474382 @@ -12080,7 +12092,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &551843514 RectTransform: m_ObjectHideFlags: 0 @@ -12642,8 +12654,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 235, y: 55} - m_SizeDelta: {x: 448.7053, y: 199.977} + m_AnchoredPosition: {x: 214.18, y: 53.659} + m_SizeDelta: {x: 428.35, y: 193.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &580499377 MonoBehaviour: @@ -12717,7 +12729,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.01129, y: -150.85625} + m_AnchoredPosition: {x: 60.011284, y: -150.85625} m_SizeDelta: {x: 111.95291, y: 22.5157} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &583938982 @@ -12950,8 +12962,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &596113693 MonoBehaviour: @@ -12974,11 +12986,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -13596,8 +13608,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &649393354 MonoBehaviour: @@ -13620,11 +13632,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -13826,7 +13838,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: 296, y: -798.124} + m_AnchoredPosition: {x: 296, y: -798.1239} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &654380194 @@ -14150,7 +14162,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: 296, y: 1171.4938} + m_AnchoredPosition: {x: 296, y: 1171.4937} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &671433511 @@ -15415,7 +15427,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &759969900 RectTransform: m_ObjectHideFlags: 0 @@ -15528,7 +15540,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &768304874 RectTransform: m_ObjectHideFlags: 0 @@ -15733,8 +15745,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &774084165 MonoBehaviour: @@ -15757,11 +15769,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -16127,7 +16139,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00012207031} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &787909716 @@ -16349,8 +16361,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &791684605 MonoBehaviour: @@ -16373,11 +16385,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -16476,7 +16488,79 @@ MonoBehaviour: m_TargetGraphic: {fileID: 793018878} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1279847809} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1908241524} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + 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 + - m_Target: {fileID: 29062616} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 964756606} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1150403854} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 1496135217} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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!114 &793018878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16607,7 +16691,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &806270147 RectTransform: m_ObjectHideFlags: 0 @@ -16699,8 +16783,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &810667038 MonoBehaviour: @@ -16723,11 +16807,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -19202,8 +19286,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &942048724 MonoBehaviour: @@ -19226,11 +19310,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -21059,7 +21143,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1049284134 RectTransform: m_ObjectHideFlags: 0 @@ -22071,8 +22155,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1095022569 MonoBehaviour: @@ -22095,11 +22179,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -22416,8 +22500,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1110153447 MonoBehaviour: @@ -22440,11 +22524,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -24068,8 +24152,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197908290 MonoBehaviour: @@ -24092,11 +24176,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -25477,7 +25561,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: -198, y: 1171.4938} + m_AnchoredPosition: {x: -198, y: 1171.4937} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1260804529 @@ -26405,8 +26489,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1296081418 MonoBehaviour: @@ -26429,11 +26513,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -26762,7 +26846,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1309489080 RectTransform: m_ObjectHideFlags: 0 @@ -27499,8 +27583,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1352877773 MonoBehaviour: @@ -27523,11 +27607,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -30655,32 +30739,32 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 41053417} - - {fileID: 910225931} - - {fileID: 1482429285} - - {fileID: 1445975910} - - {fileID: 654380193} - - {fileID: 277296490} - - {fileID: 1621579429} - - {fileID: 1631379624} - - {fileID: 1469880020} - - {fileID: 500193412} - - {fileID: 14556594} - - {fileID: 204494218} - - {fileID: 371738805} + - {fileID: 179610787} + - {fileID: 2124290841} + - {fileID: 671433510} + - {fileID: 1260804528} + - {fileID: 1059398285} - {fileID: 525378394} + - {fileID: 371738805} - {fileID: 265051830} - - {fileID: 1059398285} - - {fileID: 1260804528} - - {fileID: 671433510} - - {fileID: 2124290841} - - {fileID: 179610787} + - {fileID: 500193412} + - {fileID: 204494218} + - {fileID: 14556594} + - {fileID: 1469880020} + - {fileID: 1621579429} + - {fileID: 277296490} + - {fileID: 654380193} + - {fileID: 1631379624} + - {fileID: 910225931} + - {fileID: 1445975910} + - {fileID: 1482429285} + - {fileID: 41053417} m_Father: {fileID: 787909715} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3459.6875} + m_AnchoredPosition: {x: 0, y: -0.00054942456} + m_SizeDelta: {x: 0, y: 3606.5986} m_Pivot: {x: 0, y: 1} --- !u!1 &1519792286 GameObject: @@ -30850,7 +30934,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1523267510 RectTransform: m_ObjectHideFlags: 0 @@ -31074,7 +31158,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1546442776 RectTransform: m_ObjectHideFlags: 0 @@ -31154,7 +31238,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1562047583 RectTransform: m_ObjectHideFlags: 0 @@ -31910,7 +31994,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1618354689 RectTransform: m_ObjectHideFlags: 0 @@ -32003,7 +32087,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: -288.66, y: -472.50635} + m_AnchoredPosition: {x: -288.66, y: -472.50598} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1621579430 @@ -32217,7 +32301,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: -198, y: -798.124} + m_AnchoredPosition: {x: -198, y: -798.1239} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1631379625 @@ -32962,8 +33046,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1684490399 MonoBehaviour: @@ -32986,11 +33070,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -33296,7 +33380,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1703976289 RectTransform: m_ObjectHideFlags: 0 @@ -33799,7 +33883,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.01129, y: -150.85625} + m_AnchoredPosition: {x: 60.011284, y: -150.85625} m_SizeDelta: {x: 111.95291, y: 22.5157} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1727278513 @@ -34129,8 +34213,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1742222932 MonoBehaviour: @@ -34153,11 +34237,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -34321,8 +34405,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: 0.7695} + m_SizeDelta: {x: 224.2464, y: 43.461} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1752842581 MonoBehaviour: @@ -34345,11 +34429,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -35598,7 +35682,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1788151843 RectTransform: m_ObjectHideFlags: 0 @@ -35882,7 +35966,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1794735187 RectTransform: m_ObjectHideFlags: 0 @@ -36714,8 +36798,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1856787190 MonoBehaviour: @@ -36738,11 +36822,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -37688,7 +37772,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1909423528 RectTransform: m_ObjectHideFlags: 0 @@ -37780,8 +37864,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.9934, y: -3.5765991} + m_SizeDelta: {x: 224.2464, y: 34.7688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1911092127 MonoBehaviour: @@ -37804,11 +37888,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 27 + m_Font: {fileID: 12800000, guid: 55dfee715208b444c939004d1fe09c86, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 1 m_AlignByGeometry: 0 @@ -37842,7 +37926,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1925523367 RectTransform: m_ObjectHideFlags: 0 @@ -39230,7 +39314,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.01129, y: -150.85625} + m_AnchoredPosition: {x: 60.011284, y: -150.85625} m_SizeDelta: {x: 111.95291, y: 22.5157} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1976180162 @@ -39607,7 +39691,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1996921124 RectTransform: m_ObjectHideFlags: 0 @@ -40203,7 +40287,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2022041417 RectTransform: m_ObjectHideFlags: 0 @@ -40991,7 +41075,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2065824763 RectTransform: m_ObjectHideFlags: 0 @@ -42080,7 +42164,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2124000146 RectTransform: m_ObjectHideFlags: 0 @@ -42173,7 +42257,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: 138.40002, y: 1497.1118} + m_AnchoredPosition: {x: 138.40002, y: 1497.1117} m_SizeDelta: {x: 427.06073, y: 301.7125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2124290842 @@ -42372,19 +42456,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.y + value: 340 objectReference: {fileID: 0} - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.x - value: 1534.7767 + value: 0 objectReference: {fileID: 0} - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.y - value: -2386 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551385224146104384, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive @@ -42516,21 +42608,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.y + value: 340 objectReference: {fileID: 0} - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.x - value: 801.2233 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2573263788687539817, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.y - value: -2386 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2661376638078344898, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3056367912042238123, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -42737,83 +42841,87 @@ PrefabInstance: - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[0] value: - objectReference: {fileID: 0} + objectReference: {fileID: 1339225759} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[1] value: - objectReference: {fileID: 1339225759} + objectReference: {fileID: 402712568} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[2] value: - objectReference: {fileID: 325374329} + objectReference: {fileID: 1202181683} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[3] value: - objectReference: {fileID: 1988065900} + objectReference: {fileID: 1141459471} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[4] value: - objectReference: {fileID: 1567644381} + objectReference: {fileID: 456314792} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[5] value: - objectReference: {fileID: 193926616} + objectReference: {fileID: 1071577288} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[6] value: - objectReference: {fileID: 1765047963} + objectReference: {fileID: 2074829333} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[7] value: - objectReference: {fileID: 1702131172} + objectReference: {fileID: 1975666116} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[8] value: - objectReference: {fileID: 1307947620} + objectReference: {fileID: 595473956} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[9] value: - objectReference: {fileID: 1229668026} + objectReference: {fileID: 412723826} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[10] value: - objectReference: {fileID: 619219640} + objectReference: {fileID: 1951607853} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[11] value: - objectReference: {fileID: 255262086} + objectReference: {fileID: 783848396} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[12] value: - objectReference: {fileID: 1862283390} + objectReference: {fileID: 20464448} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[13] value: - objectReference: {fileID: 1157228512} + objectReference: {fileID: 1490996926} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[14] value: - objectReference: {fileID: 540283450} + objectReference: {fileID: 1613804424} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[15] value: - objectReference: {fileID: 1443158722} + objectReference: {fileID: 1372792161} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[16] value: - objectReference: {fileID: 1098717343} + objectReference: {fileID: 33535307} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[17] value: - objectReference: {fileID: 558127975} + objectReference: {fileID: 527690484} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[18] value: - objectReference: {fileID: 684792698} + objectReference: {fileID: 327002183} - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: levelButtons.Array.data[19] value: - objectReference: {fileID: 992493975} + objectReference: {fileID: 176057952} + - target: {fileID: 4257798817202098691, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: levelButtons.Array.data[20] + value: + objectReference: {fileID: 412723826} - target: {fileID: 4361158456786051210, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive value: 1 @@ -42842,6 +42950,10 @@ PrefabInstance: propertyPath: m_TrackedObjectOffset.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5500339236017155292, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_Spacing + value: 107.8 + objectReference: {fileID: 0} - target: {fileID: 5502172977615969978, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive value: 0 @@ -42982,6 +43094,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8333583405932108569, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405932108569, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405932108569, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405932108569, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405947421027, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405947421027, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405947421027, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8333583405947421027, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8425663271378708983, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_LocalPosition.x value: 1.37 @@ -42996,19 +43140,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_SizeDelta.y + value: 340 objectReference: {fileID: 0} - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.x - value: 1168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8577898083468301940, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchoredPosition.y - value: -2386 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8603563005481145159, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive @@ -43022,6 +43174,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -403 objectReference: {fileID: 0} + - target: {fileID: 8951283338016312442, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.y + value: -460 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralMysto.prefab b/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralMysto.prefab index 27f3e7b4..ba4f0b11 100644 --- a/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralMysto.prefab +++ b/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralMysto.prefab @@ -464,7 +464,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 928931991406647008, guid: 559c40fc91d73514997bf2450e855e89, type: 3} propertyPath: m_Layer diff --git a/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralWizard.prefab b/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralWizard.prefab index 26fe2ce9..a872b4cd 100644 --- a/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralWizard.prefab +++ b/Assets/Source/Prefabs/Members/2048/Neutral Members/neutralWizard.prefab @@ -464,7 +464,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 928931991406647008, guid: 559c40fc91d73514997bf2450e855e89, type: 3} propertyPath: m_Layer diff --git a/Assets/Source/Prefabs/Projectiles/Pistol Bullet.prefab b/Assets/Source/Prefabs/Projectiles/Pistol Bullet.prefab index 3928f56b..f8e24486 100644 --- a/Assets/Source/Prefabs/Projectiles/Pistol Bullet.prefab +++ b/Assets/Source/Prefabs/Projectiles/Pistol Bullet.prefab @@ -228,7 +228,6 @@ MonoBehaviour: projectileParticles: - {fileID: 1118852334229578234} - {fileID: 3727631899976960989} - - {fileID: 8439904960820043571} impactParticles: [] muzzleParticles: [] --- !u!1001 &1118852334229606176 @@ -625,8 +624,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 482184, guid: 2600ac3c92a32344aac7a38b64dc2f5c, type: 3} m_PrefabInstance: {fileID: 8439904960820117577} m_PrefabAsset: {fileID: 0} ---- !u!1 &8439904960820043571 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 122746, guid: 2600ac3c92a32344aac7a38b64dc2f5c, type: 3} - m_PrefabInstance: {fileID: 8439904960820117577} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Source/Scripts/GameProgress.cs b/Assets/Source/Scripts/GameProgress.cs index daa007b8..5310de2c 100644 --- a/Assets/Source/Scripts/GameProgress.cs +++ b/Assets/Source/Scripts/GameProgress.cs @@ -15,7 +15,7 @@ public class GameProgress : GameStateMachineUser [SerializeField] private Vector2 levelUpTimeRange; [SerializeField] private Button[] levelButtons; // Array for buttons [SerializeField] private Text[] levelTexts; // Array for corresponding Text objects - + int levelIndex; private float XPforLevelUp; private float totalXP; private float needToFinish; @@ -61,17 +61,20 @@ public class GameProgress : GameStateMachineUser { int index = i; // Capture the index to use it in the button's callback levelButtons[i].onClick.AddListener(() => SetLevel(index)); - + levelButtons[i].transform.GetChild(1).gameObject.SetActive(false); } + levelButtons[0].transform.GetChild(1).gameObject.SetActive(true); } // Method to set the level based on the button clicked public void SetLevel(int index) { + levelIndex = index; if (index >= 0 && index < levels.Length) { _levelSO = levels[index]; // Set the corresponding level Debug.Log("Level changed to: " + index); + Debug.Log("Level changed to: " + levelIndex); // Deactivate all Texts, then activate the one corresponding to the index for (int i = 0; i < levelTexts.Length; i++) @@ -89,12 +92,17 @@ public class GameProgress : GameStateMachineUser protected override void OnGameFinish() { isFinished = true; + levelButtons[levelIndex].transform.GetChild(0).GetChild(1).gameObject.SetActive(true); + levelButtons[levelIndex + 1].transform.GetChild(0).GetChild(2).gameObject.SetActive(false); + levelButtons[levelIndex + 1].transform.GetChild(1).gameObject.SetActive(true); + Debug.Log("level completed"); } private void Update() { if (isStarted && !isFinished) { + Debug.Log("level completed"); levelTime += Time.deltaTime; levelUpTimer += Time.deltaTime; diff --git a/Assets/Source/Scripts/GameProgress1.cs b/Assets/Source/Scripts/GameProgress1.cs new file mode 100644 index 00000000..5fc648b0 --- /dev/null +++ b/Assets/Source/Scripts/GameProgress1.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameProgress1 : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Source/Scripts/GameProgress1.cs.meta b/Assets/Source/Scripts/GameProgress1.cs.meta new file mode 100644 index 00000000..4308a1b7 --- /dev/null +++ b/Assets/Source/Scripts/GameProgress1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26f36c02037158448a09b0ab33e781e6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Source/Scripts/SO/Levels/LevelSO.cs b/Assets/Source/Scripts/SO/Levels/LevelSO.cs index 46bf8d86..3fa18e20 100644 --- a/Assets/Source/Scripts/SO/Levels/LevelSO.cs +++ b/Assets/Source/Scripts/SO/Levels/LevelSO.cs @@ -6,7 +6,7 @@ using static D2D.Utilities.CommonGameplayFacade; public class LevelSO : ScriptableObject { [SerializeField] private Wave[] waves; - [SerializeField] private float totalDuration = 300f; + [SerializeField] private float totalDuration;//= 300f; [SerializeField] private float baseXPToLevelUp = 100f; [SerializeField] private float stepXPOnLevelUp = 50f; diff --git a/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset b/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset new file mode 100644 index 00000000..3400e1d4 --- /dev/null +++ b/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 11500000, guid: 46a06a5d7d9814245be97a9c4b73a37d, type: 3} + m_Name: infiniteLevel + m_EditorClassIdentifier: + waves: + - {fileID: 11400000, guid: 822532fd1d1818849a3d7c57b869ad4c, type: 2} + - {fileID: 11400000, guid: c63cb65c9da870a4a908161c50287db8, type: 2} + - {fileID: 11400000, guid: bd49e2566c701f940a64142d971fde96, type: 2} + - {fileID: 11400000, guid: 21933b25268cfae4dad8b9758d8e2e78, type: 2} + - {fileID: 11400000, guid: a79e6abfcbf3e2142ad09834da6f4f32, type: 2} + - {fileID: 11400000, guid: 277687fda0c94e74a856c37b4089ff4a, type: 2} + totalDuration: 120 + baseXPToLevelUp: 60 + stepXPOnLevelUp: 75 diff --git a/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset.meta b/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset.meta new file mode 100644 index 00000000..ea4dbb7c --- /dev/null +++ b/Assets/Source/Scripts/SO/Levels/infiniteLevel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb45433d98f3b374b805deacccf9b1e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/MemberUpgrades.cs b/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/MemberUpgrades.cs index c73cd304..80c229f4 100644 --- a/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/MemberUpgrades.cs +++ b/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/MemberUpgrades.cs @@ -4,10 +4,15 @@ using UnityEngine; [CreateAssetMenu(menuName = "Game/Upgrades/Member Upgrade")] public class MemberUpgrades : Upgrades { - [SerializeField] private GameObject memberPrefab; + [SerializeField] private GameObject[] memberPrefab; [SerializeField] private Sprite silhouetteIcon; - public GameObject MemberPrefab => memberPrefab; + public GameObject MemberPrefab => memberPrefab[index]; public override UpgradesType GetUpgradeType() => UpgradesType.Member; public Sprite SilhouetteIcon => silhouetteIcon; + int index; + private void Awake() + { + index = PlayerPrefs.GetInt("selectedCharacterIndex"); + } } \ No newline at end of file diff --git a/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/Pistol Upgrade.asset b/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/Pistol Upgrade.asset index 471e4c27..efb0b64a 100644 --- a/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/Pistol Upgrade.asset +++ b/Assets/Source/Scripts/SO/Upgrades/Member Upgrades/Pistol Upgrade.asset @@ -14,5 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: icon: {fileID: 21300000, guid: 6c56a78d4a6fc94408b86d57a5f9c52b, type: 3} upgradeText: Pistol - memberPrefab: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3} + memberPrefab: + - {fileID: 7491453008988252747, guid: 8da4dcbd91b5bd140b7b6b1eb50bbb29, type: 3} + - {fileID: 7491453008988252747, guid: f8c2aca7a5900184a820428aea2ddd24, type: 3} silhouetteIcon: {fileID: 21300000, guid: bc21ce2dc3abe2e4a84bbc8e03e83d75, type: 3} diff --git a/Assets/muzzleController.cs b/Assets/muzzleController.cs new file mode 100644 index 00000000..826e732d --- /dev/null +++ b/Assets/muzzleController.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class muzzleController : MonoBehaviour +{ + public List muzzleParticles = new List(); + int index; + void Start() + { + index = PlayerPrefs.GetInt("selectedCharacterIndex"); + Debug.Log("index is" + index); + //enablemuzzleParticles(index); + //enableimpactParticles(index); + //enablemuzzleParticles(index); + } + public void enablemuzzleParticles(int val) + { + muzzleParticles[val].SetActive(true); + } +} \ No newline at end of file diff --git a/Assets/muzzleController.cs.meta b/Assets/muzzleController.cs.meta new file mode 100644 index 00000000..81ba769d --- /dev/null +++ b/Assets/muzzleController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1d2d45c0f985fa45a7504ad6b7eb3ba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/hs_err_pid20196.log b/hs_err_pid20196.log new file mode 100644 index 00000000..cd2652fa --- /dev/null +++ b/hs_err_pid20196.log @@ -0,0 +1,197 @@ +# +# There is insufficient memory for the Java Runtime Environment to continue. +# Native memory allocation (mmap) failed to map 134217728 bytes for Failed to commit area from 0x0000000080400000 to 0x0000000088400000 of length 134217728. +# Possible reasons: +# The system is out of physical RAM or swap space +# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap +# Possible solutions: +# Reduce memory load on the system +# Increase physical memory or swap space +# Check if swap backing store is full +# Decrease Java heap size (-Xmx/-Xms) +# Decrease number of Java threads +# Decrease Java thread stack sizes (-Xss) +# Set larger code cache with -XX:ReservedCodeCacheSize= +# This output file may be truncated or incomplete. +# +# Out of Memory Error (./src/hotspot/os/windows/os_windows.cpp:3387), pid=20196, tid=21564 +# +# JRE version: (11.0.14.1+1) (build ) +# Java VM: OpenJDK 64-Bit Server VM (11.0.14.1+1, mixed mode, sharing, tiered, compressed oops, g1 gc, windows-amd64) +# No core dump will be written. Minidumps are not enabled by default on client versions of Windows +# + +--------------- S U M M A R Y ------------ + +Command Line: -Dfile.encoding=UTF-8 + +Host: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 4 cores, 7G, Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +Time: Thu Sep 26 15:19:56 2024 Pakistan Standard Time elapsed time: 0.021666 seconds (0d 0h 0m 0s) + +--------------- T H R E A D --------------- + +Current thread (0x000001c42b8b0000): JavaThread "Unknown thread" [_thread_in_vm, id=21564, stack(0x00000011cc300000,0x00000011cc400000)] + +Stack: [0x00000011cc300000,0x00000011cc400000] +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [jvm.dll+0x61e59a] +V [jvm.dll+0x7aaca9] +V [jvm.dll+0x7ac398] +V [jvm.dll+0x7aca73] +V [jvm.dll+0x24f9b8] +V [jvm.dll+0x61b83a] +V [jvm.dll+0x6100c5] +V [jvm.dll+0x30772c] +V [jvm.dll+0x3075b2] +V [jvm.dll+0x30c2d6] +V [jvm.dll+0x35272f] +V [jvm.dll+0x352160] +V [jvm.dll+0x2e4728] +V [jvm.dll+0x2e5886] +V [jvm.dll+0x784b07] +V [jvm.dll+0x78628f] +V [jvm.dll+0x35f479] +V [jvm.dll+0x767aa0] +V [jvm.dll+0x3ccf1f] +V [jvm.dll+0x3cf2b1] +C [jli.dll+0x5207] +C [ucrtbase.dll+0x21bb2] +C [KERNEL32.DLL+0x17374] +C [ntdll.dll+0x4cc91] + + +--------------- P R O C E S S --------------- + +Threads class SMR info: +_java_thread_list=0x000001c42973e960, length=0, elements={ +} + +Java Threads: ( => current thread ) + +Other Threads: + 0x000001c42b8ca000 GCTaskThread "GC Thread#0" [stack: 0x00000011cc400000,0x00000011cc500000] [id=21552] + 0x000001c42b8fb800 ConcurrentGCThread "G1 Main Marker" [stack: 0x00000011cc500000,0x00000011cc600000] [id=7176] + 0x000001c42b8fd800 ConcurrentGCThread "G1 Conc#0" [stack: 0x00000011cc600000,0x00000011cc700000] [id=17456] + +[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffeb68a3ef7] + +VM state:not at safepoint (not fully initialized) + +VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event]) +[0x000001c42b8ad900] Heap_lock - owner thread: 0x000001c42b8b0000 + +Heap address: 0x0000000080400000, size: 2044 MB, Compressed Oops mode: Non-zero based: 0x0000000080400000 +Narrow klass base: 0x0000000000000000, Narrow klass shift: 0 + +GC Heap History (0 events): +No events + +Deoptimization events (0 events): +No events + +Classes redefined (0 events): +No events + +Internal exceptions (0 events): +No events + +Events (1 events): +Event: 0.008 Loaded shared library C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + + +Dynamic libraries: +0x00007ff7e32a0000 - 0x00007ff7e32ad000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.exe +0x00007fff8f4b0000 - 0x00007fff8f6a8000 C:\Windows\SYSTEM32\ntdll.dll +0x00007fff8e8f0000 - 0x00007fff8e9b1000 C:\Windows\System32\KERNEL32.DLL +0x00007fff8cbb0000 - 0x00007fff8cead000 C:\Windows\System32\KERNELBASE.dll +0x00007fff8a050000 - 0x00007fff8a0e4000 C:\Windows\SYSTEM32\apphelp.dll +0x00007fff8cf40000 - 0x00007fff8d040000 C:\Windows\System32\ucrtbase.dll +0x00007fff89df0000 - 0x00007fff89e07000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jli.dll +0x00007fff73a80000 - 0x00007fff73a95000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\VCRUNTIME140.dll +0x00007fff8efc0000 - 0x00007fff8f15d000 C:\Windows\System32\USER32.dll +0x00007fff8d040000 - 0x00007fff8d062000 C:\Windows\System32\win32u.dll +0x00007fff8eef0000 - 0x00007fff8ef1b000 C:\Windows\System32\GDI32.dll +0x00007fff8d1c0000 - 0x00007fff8d2d7000 C:\Windows\System32\gdi32full.dll +0x00007fff8d070000 - 0x00007fff8d10d000 C:\Windows\System32\msvcp_win.dll +0x00007fff803e0000 - 0x00007fff8067a000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16\COMCTL32.dll +0x00007fff8ef20000 - 0x00007fff8efbe000 C:\Windows\System32\msvcrt.dll +0x00007fff8dbc0000 - 0x00007fff8dbef000 C:\Windows\System32\IMM32.DLL +0x00007fff0e250000 - 0x00007fff0e2eb000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\msvcp140.dll +0x00007ffeb65b0000 - 0x00007ffeb7131000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server\jvm.dll +0x00007fff8e9c0000 - 0x00007fff8ea70000 C:\Windows\System32\ADVAPI32.dll +0x00007fff8d8c0000 - 0x00007fff8d960000 C:\Windows\System32\sechost.dll +0x00007fff8da90000 - 0x00007fff8dbb3000 C:\Windows\System32\RPCRT4.dll +0x00007fff8d4b0000 - 0x00007fff8d4d7000 C:\Windows\System32\bcrypt.dll +0x00007fff8eee0000 - 0x00007fff8eee8000 C:\Windows\System32\PSAPI.DLL +0x00007fff7e590000 - 0x00007fff7e5b7000 C:\Windows\SYSTEM32\WINMM.dll +0x00007fff862e0000 - 0x00007fff862ea000 C:\Windows\SYSTEM32\VERSION.dll +0x00007fff89fa0000 - 0x00007fff89fa9000 C:\Windows\SYSTEM32\WSOCK32.dll +0x00007fff8f370000 - 0x00007fff8f3db000 C:\Windows\System32\WS2_32.dll +0x00007fff8aa00000 - 0x00007fff8aa12000 C:\Windows\SYSTEM32\kernel.appcore.dll +0x00007fff82110000 - 0x00007fff82120000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\verify.dll +0x00007fff77060000 - 0x00007fff77244000 C:\Windows\SYSTEM32\DBGHELP.DLL +0x00007fff77510000 - 0x00007fff77544000 C:\Windows\SYSTEM32\dbgcore.DLL +0x00007fff8ceb0000 - 0x00007fff8cf32000 C:\Windows\System32\bcryptPrimitives.dll +0x00007fff6ad30000 - 0x00007fff6ad58000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.dll +0x00007fff81810000 - 0x00007fff8181a000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jimage.dll +0x00007fff73a60000 - 0x00007fff73a78000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + +dbghelp: loaded successfully - version: 4.0.5 - missing functions: none +symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server + +VM Arguments: +jvm_args: -Dfile.encoding=UTF-8 +java_command: +java_class_path (initial): +Launcher Type: SUN_STANDARD + +[Global flags] + intx CICompilerCount = 3 {product} {ergonomic} + uint ConcGCThreads = 1 {product} {ergonomic} + uint G1ConcRefinementThreads = 4 {product} {ergonomic} + size_t G1HeapRegionSize = 1048576 {product} {ergonomic} + uintx GCDrainStackTargetSize = 64 {product} {ergonomic} + size_t InitialHeapSize = 134217728 {product} {ergonomic} + size_t MarkStackSize = 4194304 {product} {ergonomic} + size_t MaxHeapSize = 2143289344 {product} {ergonomic} + size_t MinHeapDeltaBytes = 1048576 {product} {ergonomic} + uintx NonNMethodCodeHeapSize = 5830732 {pd product} {ergonomic} + uintx NonProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic} + bool SegmentedCodeCache = true {product} {ergonomic} + bool UseCompressedClassPointers = true {lp64_product} {ergonomic} + bool UseCompressedOops = true {lp64_product} {ergonomic} + bool UseG1GC = true {product} {ergonomic} + bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic} + +Logging: +Log output configuration: + #0: stdout all=warning uptime,level,tags + #1: stderr all=off uptime,level,tags + +Environment Variables: +JAVA_HOME=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK +JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 +PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Users\Samia\AppData\Local\Microsoft\WindowsApps;C:\Users\Samia\AppData\Local\GitHubDesktop\bin +USERNAME=Samia +OS=Windows_NT +PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel + + + +--------------- S Y S T E M --------------- + +OS: Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +OS uptime: 0 days 5:13 hours + +CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7 microcode 0x2f, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit + +Memory: 4k page, system-wide physical 8171M (436M free) +TotalPageFile size 22480M (AvailPageFile size 124M) +current process WorkingSet (physical memory assigned to process): 10M, peak: 10M +current process commit charge ("private bytes"): 51M, peak: 179M + +vm_info: OpenJDK 64-Bit Server VM (11.0.14.1+1) for windows-amd64 JRE (11.0.14.1+1), built on Feb 9 2022 01:48:27 by "" with unknown MS VC++:1916 + +END. diff --git a/hs_err_pid21556.log b/hs_err_pid21556.log new file mode 100644 index 00000000..8b55d89c --- /dev/null +++ b/hs_err_pid21556.log @@ -0,0 +1,198 @@ +# +# There is insufficient memory for the Java Runtime Environment to continue. +# Native memory allocation (mmap) failed to map 134217728 bytes for Failed to commit area from 0x0000000080400000 to 0x0000000088400000 of length 134217728. +# Possible reasons: +# The system is out of physical RAM or swap space +# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap +# Possible solutions: +# Reduce memory load on the system +# Increase physical memory or swap space +# Check if swap backing store is full +# Decrease Java heap size (-Xmx/-Xms) +# Decrease number of Java threads +# Decrease Java thread stack sizes (-Xss) +# Set larger code cache with -XX:ReservedCodeCacheSize= +# This output file may be truncated or incomplete. +# +# Out of Memory Error (./src/hotspot/os/windows/os_windows.cpp:3387), pid=21556, tid=16456 +# +# JRE version: (11.0.14.1+1) (build ) +# Java VM: OpenJDK 64-Bit Server VM (11.0.14.1+1, mixed mode, sharing, tiered, compressed oops, g1 gc, windows-amd64) +# No core dump will be written. Minidumps are not enabled by default on client versions of Windows +# + +--------------- S U M M A R Y ------------ + +Command Line: -Dfile.encoding=UTF-8 -Dcom.android.sdkmanager.toolsdir=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\\.. com.android.sdklib.tool.AvdManagerCli list target -c + +Host: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 4 cores, 7G, Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +Time: Thu Sep 26 15:19:55 2024 Pakistan Standard Time elapsed time: 0.038389 seconds (0d 0h 0m 0s) + +--------------- T H R E A D --------------- + +Current thread (0x000001fa7fba2800): JavaThread "Unknown thread" [_thread_in_vm, id=16456, stack(0x0000003ad0400000,0x0000003ad0500000)] + +Stack: [0x0000003ad0400000,0x0000003ad0500000] +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [jvm.dll+0x61e59a] +V [jvm.dll+0x7aaca9] +V [jvm.dll+0x7ac398] +V [jvm.dll+0x7aca73] +V [jvm.dll+0x24f9b8] +V [jvm.dll+0x61b83a] +V [jvm.dll+0x6100c5] +V [jvm.dll+0x30772c] +V [jvm.dll+0x3075b2] +V [jvm.dll+0x30c2d6] +V [jvm.dll+0x35272f] +V [jvm.dll+0x352160] +V [jvm.dll+0x2e4728] +V [jvm.dll+0x2e5886] +V [jvm.dll+0x784b07] +V [jvm.dll+0x78628f] +V [jvm.dll+0x35f479] +V [jvm.dll+0x767aa0] +V [jvm.dll+0x3ccf1f] +V [jvm.dll+0x3cf2b1] +C [jli.dll+0x5207] +C [ucrtbase.dll+0x21bb2] +C [KERNEL32.DLL+0x17374] +C [ntdll.dll+0x4cc91] + + +--------------- P R O C E S S --------------- + +Threads class SMR info: +_java_thread_list=0x000001fa7e1c0550, length=0, elements={ +} + +Java Threads: ( => current thread ) + +Other Threads: + 0x000001fa7fbbb000 GCTaskThread "GC Thread#0" [stack: 0x0000003ad0500000,0x0000003ad0600000] [id=12784] + 0x000001fa7fbeb800 ConcurrentGCThread "G1 Main Marker" [stack: 0x0000003ad0600000,0x0000003ad0700000] [id=20324] + 0x000001fa7fbed800 ConcurrentGCThread "G1 Conc#0" [stack: 0x0000003ad0700000,0x0000003ad0800000] [id=18524] + +[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffeb68a3ef7] + +VM state:not at safepoint (not fully initialized) + +VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event]) +[0x000001fa7fb9f430] Heap_lock - owner thread: 0x000001fa7fba2800 + +Heap address: 0x0000000080400000, size: 2044 MB, Compressed Oops mode: Non-zero based: 0x0000000080400000 +Narrow klass base: 0x0000000000000000, Narrow klass shift: 0 + +GC Heap History (0 events): +No events + +Deoptimization events (0 events): +No events + +Classes redefined (0 events): +No events + +Internal exceptions (0 events): +No events + +Events (1 events): +Event: 0.015 Loaded shared library C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + + +Dynamic libraries: +0x00007ff7e32a0000 - 0x00007ff7e32ad000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.exe +0x00007fff8f4b0000 - 0x00007fff8f6a8000 C:\Windows\SYSTEM32\ntdll.dll +0x00007fff8e8f0000 - 0x00007fff8e9b1000 C:\Windows\System32\KERNEL32.DLL +0x00007fff8cbb0000 - 0x00007fff8cead000 C:\Windows\System32\KERNELBASE.dll +0x00007fff8a050000 - 0x00007fff8a0e4000 C:\Windows\SYSTEM32\apphelp.dll +0x00007fff8cf40000 - 0x00007fff8d040000 C:\Windows\System32\ucrtbase.dll +0x00007fff73a80000 - 0x00007fff73a97000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jli.dll +0x00007fff8efc0000 - 0x00007fff8f15d000 C:\Windows\System32\USER32.dll +0x00007fff8d040000 - 0x00007fff8d062000 C:\Windows\System32\win32u.dll +0x00007fff8eef0000 - 0x00007fff8ef1b000 C:\Windows\System32\GDI32.dll +0x00007fff8d1c0000 - 0x00007fff8d2d7000 C:\Windows\System32\gdi32full.dll +0x00007fff8d070000 - 0x00007fff8d10d000 C:\Windows\System32\msvcp_win.dll +0x00007fff73a60000 - 0x00007fff73a75000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\VCRUNTIME140.dll +0x00007fff803e0000 - 0x00007fff8067a000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16\COMCTL32.dll +0x00007fff8ef20000 - 0x00007fff8efbe000 C:\Windows\System32\msvcrt.dll +0x00007fff8dbc0000 - 0x00007fff8dbef000 C:\Windows\System32\IMM32.DLL +0x00007fff0e250000 - 0x00007fff0e2eb000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\msvcp140.dll +0x00007ffeb65b0000 - 0x00007ffeb7131000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server\jvm.dll +0x00007fff8e9c0000 - 0x00007fff8ea70000 C:\Windows\System32\ADVAPI32.dll +0x00007fff8d8c0000 - 0x00007fff8d960000 C:\Windows\System32\sechost.dll +0x00007fff8da90000 - 0x00007fff8dbb3000 C:\Windows\System32\RPCRT4.dll +0x00007fff8d4b0000 - 0x00007fff8d4d7000 C:\Windows\System32\bcrypt.dll +0x00007fff8eee0000 - 0x00007fff8eee8000 C:\Windows\System32\PSAPI.DLL +0x00007fff89fa0000 - 0x00007fff89fa9000 C:\Windows\SYSTEM32\WSOCK32.dll +0x00007fff8f370000 - 0x00007fff8f3db000 C:\Windows\System32\WS2_32.dll +0x00007fff7e590000 - 0x00007fff7e5b7000 C:\Windows\SYSTEM32\WINMM.dll +0x00007fff862e0000 - 0x00007fff862ea000 C:\Windows\SYSTEM32\VERSION.dll +0x00007fff8aa00000 - 0x00007fff8aa12000 C:\Windows\SYSTEM32\kernel.appcore.dll +0x00007fff89df0000 - 0x00007fff89e00000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\verify.dll +0x00007fff77060000 - 0x00007fff77244000 C:\Windows\SYSTEM32\DBGHELP.DLL +0x00007fff77510000 - 0x00007fff77544000 C:\Windows\SYSTEM32\dbgcore.DLL +0x00007fff8ceb0000 - 0x00007fff8cf32000 C:\Windows\System32\bcryptPrimitives.dll +0x00007fff6ad30000 - 0x00007fff6ad58000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.dll +0x00007fff82110000 - 0x00007fff8211a000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jimage.dll +0x00007fff72b20000 - 0x00007fff72b38000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + +dbghelp: loaded successfully - version: 4.0.5 - missing functions: none +symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server + +VM Arguments: +jvm_args: -Dfile.encoding=UTF-8 -Dcom.android.sdkmanager.toolsdir=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\\.. +java_command: com.android.sdklib.tool.AvdManagerCli list target -c +java_class_path (initial): C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\..\lib\avdmanager-classpath.jar +Launcher Type: SUN_STANDARD + +[Global flags] + intx CICompilerCount = 3 {product} {ergonomic} + uint ConcGCThreads = 1 {product} {ergonomic} + uint G1ConcRefinementThreads = 4 {product} {ergonomic} + size_t G1HeapRegionSize = 1048576 {product} {ergonomic} + uintx GCDrainStackTargetSize = 64 {product} {ergonomic} + size_t InitialHeapSize = 134217728 {product} {ergonomic} + size_t MarkStackSize = 4194304 {product} {ergonomic} + size_t MaxHeapSize = 2143289344 {product} {ergonomic} + size_t MinHeapDeltaBytes = 1048576 {product} {ergonomic} + uintx NonNMethodCodeHeapSize = 5830732 {pd product} {ergonomic} + uintx NonProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic} + bool SegmentedCodeCache = true {product} {ergonomic} + bool UseCompressedClassPointers = true {lp64_product} {ergonomic} + bool UseCompressedOops = true {lp64_product} {ergonomic} + bool UseG1GC = true {product} {ergonomic} + bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic} + +Logging: +Log output configuration: + #0: stdout all=warning uptime,level,tags + #1: stderr all=off uptime,level,tags + +Environment Variables: +JAVA_HOME=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK +JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 +CLASSPATH=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\..\lib\avdmanager-classpath.jar +PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Users\Samia\AppData\Local\Microsoft\WindowsApps;C:\Users\Samia\AppData\Local\GitHubDesktop\bin +USERNAME=Samia +OS=Windows_NT +PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel + + + +--------------- S Y S T E M --------------- + +OS: Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +OS uptime: 0 days 5:13 hours + +CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7 microcode 0x2f, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit + +Memory: 4k page, system-wide physical 8171M (358M free) +TotalPageFile size 22480M (AvailPageFile size 73M) +current process WorkingSet (physical memory assigned to process): 10M, peak: 10M +current process commit charge ("private bytes"): 51M, peak: 179M + +vm_info: OpenJDK 64-Bit Server VM (11.0.14.1+1) for windows-amd64 JRE (11.0.14.1+1), built on Feb 9 2022 01:48:27 by "" with unknown MS VC++:1916 + +END. diff --git a/hs_err_pid22312.log b/hs_err_pid22312.log new file mode 100644 index 00000000..4ba5c7c0 --- /dev/null +++ b/hs_err_pid22312.log @@ -0,0 +1,195 @@ +# +# There is insufficient memory for the Java Runtime Environment to continue. +# Native memory allocation (mmap) failed to map 134217728 bytes for Failed to commit area from 0x0000000080400000 to 0x0000000088400000 of length 134217728. +# Possible reasons: +# The system is out of physical RAM or swap space +# The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap +# Possible solutions: +# Reduce memory load on the system +# Increase physical memory or swap space +# Check if swap backing store is full +# Decrease Java heap size (-Xmx/-Xms) +# Decrease number of Java threads +# Decrease Java thread stack sizes (-Xss) +# Set larger code cache with -XX:ReservedCodeCacheSize= +# This output file may be truncated or incomplete. +# +# Out of Memory Error (./src/hotspot/os/windows/os_windows.cpp:3387), pid=22312, tid=22412 +# +# JRE version: (11.0.14.1+1) (build ) +# Java VM: OpenJDK 64-Bit Server VM (11.0.14.1+1, mixed mode, sharing, tiered, compressed oops, g1 gc, windows-amd64) +# No core dump will be written. Minidumps are not enabled by default on client versions of Windows +# + +--------------- S U M M A R Y ------------ + +Command Line: + +Host: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 4 cores, 7G, Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +Time: Thu Sep 26 15:19:53 2024 Pakistan Standard Time elapsed time: 0.095118 seconds (0d 0h 0m 0s) + +--------------- T H R E A D --------------- + +Current thread (0x0000018864baf800): JavaThread "Unknown thread" [_thread_in_vm, id=22412, stack(0x00000023e4f00000,0x00000023e5000000)] + +Stack: [0x00000023e4f00000,0x00000023e5000000] +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [jvm.dll+0x61e59a] +V [jvm.dll+0x7aaca9] +V [jvm.dll+0x7ac398] +V [jvm.dll+0x7aca73] +V [jvm.dll+0x24f9b8] +V [jvm.dll+0x61b83a] +V [jvm.dll+0x6100c5] +V [jvm.dll+0x30772c] +V [jvm.dll+0x3075b2] +V [jvm.dll+0x30c2d6] +V [jvm.dll+0x35272f] +V [jvm.dll+0x352160] +V [jvm.dll+0x2e4728] +V [jvm.dll+0x2e5886] +V [jvm.dll+0x784b07] +V [jvm.dll+0x78628f] +V [jvm.dll+0x35f479] +V [jvm.dll+0x767aa0] +V [jvm.dll+0x3ccf1f] +V [jvm.dll+0x3cf2b1] +C [jli.dll+0x5207] +C [ucrtbase.dll+0x21bb2] +C [KERNEL32.DLL+0x17374] +C [ntdll.dll+0x4cc91] + + +--------------- P R O C E S S --------------- + +Threads class SMR info: +_java_thread_list=0x000001886296e360, length=0, elements={ +} + +Java Threads: ( => current thread ) + +Other Threads: + 0x0000018864bc9800 GCTaskThread "GC Thread#0" [stack: 0x00000023e5000000,0x00000023e5100000] [id=22420] + 0x0000018864bf9800 ConcurrentGCThread "G1 Main Marker" [stack: 0x00000023e5100000,0x00000023e5200000] [id=22424] + 0x0000018864bfc000 ConcurrentGCThread "G1 Conc#0" [stack: 0x00000023e5200000,0x00000023e5300000] [id=22428] + +[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffeb68a3ef7] + +VM state:not at safepoint (not fully initialized) + +VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event]) +[0x0000018864bae3e0] Heap_lock - owner thread: 0x0000018864baf800 + +Heap address: 0x0000000080400000, size: 2044 MB, Compressed Oops mode: Non-zero based: 0x0000000080400000 +Narrow klass base: 0x0000000000000000, Narrow klass shift: 0 + +GC Heap History (0 events): +No events + +Deoptimization events (0 events): +No events + +Classes redefined (0 events): +No events + +Internal exceptions (0 events): +No events + +Events (1 events): +Event: 0.037 Loaded shared library C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + + +Dynamic libraries: +0x00007ff7e32a0000 - 0x00007ff7e32ad000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.exe +0x00007fff8f4b0000 - 0x00007fff8f6a8000 C:\Windows\SYSTEM32\ntdll.dll +0x00007fff8e8f0000 - 0x00007fff8e9b1000 C:\Windows\System32\KERNEL32.DLL +0x00007fff8cbb0000 - 0x00007fff8cead000 C:\Windows\System32\KERNELBASE.dll +0x00007fff8a050000 - 0x00007fff8a0e4000 C:\Windows\SYSTEM32\apphelp.dll +0x00007fff8cf40000 - 0x00007fff8d040000 C:\Windows\System32\ucrtbase.dll +0x00007fff72b20000 - 0x00007fff72b35000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\VCRUNTIME140.dll +0x00007fff712e0000 - 0x00007fff712f7000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jli.dll +0x00007fff8efc0000 - 0x00007fff8f15d000 C:\Windows\System32\USER32.dll +0x00007fff8d040000 - 0x00007fff8d062000 C:\Windows\System32\win32u.dll +0x00007fff803e0000 - 0x00007fff8067a000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16\COMCTL32.dll +0x00007fff8eef0000 - 0x00007fff8ef1b000 C:\Windows\System32\GDI32.dll +0x00007fff8ef20000 - 0x00007fff8efbe000 C:\Windows\System32\msvcrt.dll +0x00007fff8d1c0000 - 0x00007fff8d2d7000 C:\Windows\System32\gdi32full.dll +0x00007fff8d070000 - 0x00007fff8d10d000 C:\Windows\System32\msvcp_win.dll +0x00007fff8dbc0000 - 0x00007fff8dbef000 C:\Windows\System32\IMM32.DLL +0x00007fff09db0000 - 0x00007fff09e4b000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\msvcp140.dll +0x00007ffeb65b0000 - 0x00007ffeb7131000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server\jvm.dll +0x00007fff8e9c0000 - 0x00007fff8ea70000 C:\Windows\System32\ADVAPI32.dll +0x00007fff8d8c0000 - 0x00007fff8d960000 C:\Windows\System32\sechost.dll +0x00007fff8da90000 - 0x00007fff8dbb3000 C:\Windows\System32\RPCRT4.dll +0x00007fff8d4b0000 - 0x00007fff8d4d7000 C:\Windows\System32\bcrypt.dll +0x00007fff8eee0000 - 0x00007fff8eee8000 C:\Windows\System32\PSAPI.DLL +0x00007fff7e590000 - 0x00007fff7e5b7000 C:\Windows\SYSTEM32\WINMM.dll +0x00007fff862e0000 - 0x00007fff862ea000 C:\Windows\SYSTEM32\VERSION.dll +0x00007fff89fa0000 - 0x00007fff89fa9000 C:\Windows\SYSTEM32\WSOCK32.dll +0x00007fff8f370000 - 0x00007fff8f3db000 C:\Windows\System32\WS2_32.dll +0x00007fff8aa00000 - 0x00007fff8aa12000 C:\Windows\SYSTEM32\kernel.appcore.dll +0x00007fff82110000 - 0x00007fff82120000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\verify.dll +0x00007fff77060000 - 0x00007fff77244000 C:\Windows\SYSTEM32\DBGHELP.DLL +0x00007fff77510000 - 0x00007fff77544000 C:\Windows\SYSTEM32\dbgcore.DLL +0x00007fff8ceb0000 - 0x00007fff8cf32000 C:\Windows\System32\bcryptPrimitives.dll +0x00007fff6ad30000 - 0x00007fff6ad58000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\java.dll +0x00007fff81810000 - 0x00007fff8181a000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\jimage.dll +0x00007fff70fd0000 - 0x00007fff70fe8000 C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\zip.dll + +dbghelp: loaded successfully - version: 4.0.5 - missing functions: none +symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.4355_none_60b8b9eb71f62e16;C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK\bin\server + +VM Arguments: +java_command: +java_class_path (initial): +Launcher Type: SUN_STANDARD + +[Global flags] + intx CICompilerCount = 3 {product} {ergonomic} + uint ConcGCThreads = 1 {product} {ergonomic} + uint G1ConcRefinementThreads = 4 {product} {ergonomic} + size_t G1HeapRegionSize = 1048576 {product} {ergonomic} + uintx GCDrainStackTargetSize = 64 {product} {ergonomic} + size_t InitialHeapSize = 134217728 {product} {ergonomic} + size_t MarkStackSize = 4194304 {product} {ergonomic} + size_t MaxHeapSize = 2143289344 {product} {ergonomic} + size_t MinHeapDeltaBytes = 1048576 {product} {ergonomic} + uintx NonNMethodCodeHeapSize = 5830732 {pd product} {ergonomic} + uintx NonProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ProfiledCodeHeapSize = 122913754 {pd product} {ergonomic} + uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic} + bool SegmentedCodeCache = true {product} {ergonomic} + bool UseCompressedClassPointers = true {lp64_product} {ergonomic} + bool UseCompressedOops = true {lp64_product} {ergonomic} + bool UseG1GC = true {product} {ergonomic} + bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic} + +Logging: +Log output configuration: + #0: stdout all=warning uptime,level,tags + #1: stderr all=off uptime,level,tags + +Environment Variables: +JAVA_HOME=C:\Program Files\Unity\Hub\Editor\2022.3.15f1\Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK +PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Users\Samia\AppData\Local\Microsoft\WindowsApps;C:\Users\Samia\AppData\Local\GitHubDesktop\bin +USERNAME=Samia +OS=Windows_NT +PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel + + + +--------------- S Y S T E M --------------- + +OS: Windows 10 , 64 bit Build 19041 (10.0.19041.4842) +OS uptime: 0 days 5:13 hours + +CPU:total 4 (initial active 4) (4 cores per cpu, 1 threads per core) family 6 model 42 stepping 7 microcode 0x2f, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, clmul, tsc, tscinvbit + +Memory: 4k page, system-wide physical 8171M (404M free) +TotalPageFile size 22480M (AvailPageFile size 9M) +current process WorkingSet (physical memory assigned to process): 10M, peak: 10M +current process commit charge ("private bytes"): 51M, peak: 179M + +vm_info: OpenJDK 64-Bit Server VM (11.0.14.1+1) for windows-amd64 JRE (11.0.14.1+1), built on Feb 9 2022 01:48:27 by "" with unknown MS VC++:1916 + +END.