diff --git a/assets/Data/GameSettings.json b/assets/Data/GameSettings.json index 2164267..df39998 100644 --- a/assets/Data/GameSettings.json +++ b/assets/Data/GameSettings.json @@ -1,6 +1,6 @@ { "player": { - "defaultHP": 50, + "defaultHP": 5000, "requiredXP": [ 10, 20, diff --git a/assets/Media/Prefabs/AppRoot.prefab b/assets/Media/Prefabs/AppRoot.prefab index 1f99d3f..1ed82b7 100644 --- a/assets/Media/Prefabs/AppRoot.prefab +++ b/assets/Media/Prefabs/AppRoot.prefab @@ -1428,9 +1428,9 @@ "_far": 2000, "_color": { "__type__": "cc.Color", - "r": 75, - "g": 109, - "b": 59, + "r": 84, + "g": 75, + "b": 80, "a": 255 }, "_depth": 1, diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index 83ab5c7..4712f71 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -20,16 +20,16 @@ "__id__": 2 }, { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 129 + "__id__": 135 }, "_lpos": { "__type__": "cc.Vec3", @@ -60,7 +60,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 134 + "__id__": 140 }, "_id": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f" }, @@ -90,7 +90,7 @@ }, "targetOverrides": [ { - "__id__": 15 + "__id__": 21 } ] }, @@ -121,6 +121,15 @@ }, { "__id__": 14 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "removedComponents": [] @@ -233,6 +242,60 @@ ], "value": 2.842170943040401e-14 }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 16 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "71qF2ggGpMcLF94AUlql0u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "04xQQWRi9L24BgNT0Ki8T2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 64, + "g": 68, + "b": 58, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3aDUqkoGlDu4aozlhke/vm" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -241,10 +304,10 @@ "y8" ], "target": { - "__id__": 16 + "__id__": 22 }, "targetInfo": { - "__id__": 17 + "__id__": 23 } }, { @@ -269,7 +332,7 @@ "_active": true, "_components": [ { - "__id__": 19 + "__id__": 25 } ], "_prefab": null, @@ -308,7 +371,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -332,19 +395,10 @@ }, "_children": [ { - "__id__": 21 + "__id__": 27 }, { - "__id__": 29 - }, - { - "__id__": 32 - }, - { - "__id__": 34 - }, - { - "__id__": 36 + "__id__": 35 }, { "__id__": 38 @@ -356,34 +410,43 @@ "__id__": 42 }, { - "__id__": 52 + "__id__": 44 }, { - "__id__": 66 + "__id__": 46 }, { - "__id__": 70 + "__id__": 48 }, { - "__id__": 73 + "__id__": 58 }, { - "__id__": 122 + "__id__": 72 + }, + { + "__id__": 76 + }, + { + "__id__": 79 + }, + { + "__id__": 128 } ], "_active": true, "_components": [ { - "__id__": 125 + "__id__": 131 }, { - "__id__": 126 + "__id__": 132 }, { - "__id__": 127 + "__id__": 133 }, { - "__id__": 128 + "__id__": 134 } ], "_prefab": null, @@ -420,17 +483,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 20 + "__id__": 26 }, "_prefab": { - "__id__": 22 + "__id__": 28 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 21 + "__id__": 27 }, "asset": { "__uuid__": "8a193591-d71d-493f-8010-f7c8c13b6ec8", @@ -438,7 +501,7 @@ }, "fileId": "62B+OqAzROoon1s4L/Ur4W", "instance": { - "__id__": 23 + "__id__": 29 }, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -451,16 +514,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 24 + "__id__": 30 }, { - "__id__": 26 + "__id__": 32 }, { - "__id__": 27 + "__id__": 33 }, { - "__id__": 28 + "__id__": 34 } ], "removedComponents": [] @@ -468,7 +531,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 31 }, "propertyPath": [ "_name" @@ -484,7 +547,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 31 }, "propertyPath": [ "_lpos" @@ -499,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 31 }, "propertyPath": [ "_lrot" @@ -515,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 31 }, "propertyPath": [ "_euler" @@ -533,16 +596,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 36 }, { - "__id__": 31 + "__id__": 37 } ], "_prefab": null, @@ -581,7 +644,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 35 }, "_enabled": true, "__prefab": null, @@ -603,7 +666,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 35 }, "_enabled": true, "__prefab": null, @@ -637,13 +700,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 39 } ], "_prefab": null, @@ -682,7 +745,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 38 }, "_enabled": true, "__prefab": null, @@ -698,13 +761,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 41 } ], "_prefab": null, @@ -743,7 +806,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 40 }, "_enabled": true, "__prefab": null, @@ -759,13 +822,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 43 } ], "_prefab": null, @@ -804,7 +867,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 42 }, "_enabled": true, "__prefab": null, @@ -820,13 +883,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 45 } ], "_prefab": null, @@ -865,7 +928,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 44 }, "_enabled": true, "__prefab": null, @@ -881,13 +944,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 47 } ], "_prefab": null, @@ -926,7 +989,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 46 }, "_enabled": true, "__prefab": null, @@ -940,17 +1003,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 20 + "__id__": 26 }, "_prefab": { - "__id__": 43 + "__id__": 49 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 48 }, "asset": { "__uuid__": "27c97ec7-9bb8-4e4e-a264-ce49f2ae9843", @@ -958,7 +1021,7 @@ }, "fileId": "fbcM/H31RNxK0HvQrwpElL", "instance": { - "__id__": 44 + "__id__": 50 }, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -971,19 +1034,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 51 }, { - "__id__": 47 + "__id__": 53 }, { - "__id__": 48 + "__id__": 54 }, { - "__id__": 49 + "__id__": 55 }, { - "__id__": 50 + "__id__": 56 } ], "removedComponents": [] @@ -991,7 +1054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 52 }, "propertyPath": [ "_name" @@ -1007,7 +1070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -1022,7 +1085,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 52 }, "propertyPath": [ "_lrot" @@ -1038,7 +1101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 52 }, "propertyPath": [ "_euler" @@ -1053,7 +1116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 57 }, "propertyPath": [ "_defaultClip" @@ -1075,18 +1138,9 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ - { - "__id__": 53 - }, - { - "__id__": 55 - }, - { - "__id__": 57 - }, { "__id__": 59 }, @@ -1095,12 +1149,21 @@ }, { "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 + }, + { + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 71 } ], "_prefab": null, @@ -1139,13 +1202,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 60 } ], "_prefab": null, @@ -1184,7 +1247,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 59 }, "_enabled": true, "__prefab": null, @@ -1200,13 +1263,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 62 } ], "_prefab": null, @@ -1245,7 +1308,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -1261,13 +1324,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 64 } ], "_prefab": null, @@ -1306,7 +1369,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -1322,13 +1385,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 60 + "__id__": 66 } ], "_prefab": null, @@ -1367,7 +1430,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1383,13 +1446,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 68 } ], "_prefab": null, @@ -1428,7 +1491,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -1444,13 +1507,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 70 } ], "_prefab": null, @@ -1489,7 +1552,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 69 }, "_enabled": true, "__prefab": null, @@ -1505,28 +1568,28 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 58 }, "_enabled": true, "__prefab": null, "xpSpawner": { - "__id__": 54 - }, - "goldSpawner": { - "__id__": 56 - }, - "healthPotionSpawner": { - "__id__": 58 - }, - "magnetSpawner": { "__id__": 60 }, - "chestSpawner": { + "goldSpawner": { "__id__": 62 }, - "pickupEffectManager": { + "healthPotionSpawner": { "__id__": 64 }, + "magnetSpawner": { + "__id__": 66 + }, + "chestSpawner": { + "__id__": 68 + }, + "pickupEffectManager": { + "__id__": 70 + }, "_id": "98EDpSoeBKp7eDmPXKNFJ0" }, { @@ -1535,17 +1598,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { - "__id__": 67 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 75 } ], "_prefab": null, @@ -1584,13 +1647,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 74 } ], "_prefab": null, @@ -1629,7 +1692,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 73 }, "_enabled": true, "__prefab": null, @@ -1683,12 +1746,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 72 }, "_enabled": true, "__prefab": null, "enemySpawner": { - "__id__": 68 + "__id__": 74 }, "_id": "1ffjazmm5IkZwKInsSIULY" }, @@ -1698,16 +1761,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 77 }, { - "__id__": 72 + "__id__": 78 } ], "_prefab": null, @@ -1746,7 +1809,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -1768,7 +1831,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -1784,23 +1847,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { - "__id__": 74 + "__id__": 80 }, { - "__id__": 111 + "__id__": 117 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 126 }, { - "__id__": 121 + "__id__": 127 } ], "_prefab": null, @@ -1839,29 +1902,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 73 + "__id__": 79 }, "_children": [ { - "__id__": 75 + "__id__": 81 }, { - "__id__": 89 + "__id__": 95 }, { - "__id__": 92 + "__id__": 98 }, { - "__id__": 101 + "__id__": 107 } ], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 115 }, { - "__id__": 110 + "__id__": 116 } ], "_prefab": null, @@ -1900,29 +1963,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 80 }, "_children": [ { - "__id__": 76 + "__id__": 82 }, { - "__id__": 79 + "__id__": 85 }, { - "__id__": 83 + "__id__": 89 } ], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 92 }, { - "__id__": 87 + "__id__": 93 }, { - "__id__": 88 + "__id__": 94 } ], "_prefab": null, @@ -1961,16 +2024,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 81 }, "_children": [], "_active": false, "_components": [ { - "__id__": 77 + "__id__": 83 }, { - "__id__": 78 + "__id__": 84 } ], "_prefab": null, @@ -2009,7 +2072,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 82 }, "_enabled": true, "__prefab": null, @@ -2031,7 +2094,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 82 }, "_enabled": true, "__prefab": null, @@ -2070,19 +2133,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 81 }, "_children": [], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 86 }, { - "__id__": 81 + "__id__": 87 }, { - "__id__": 82 + "__id__": 88 } ], "_prefab": null, @@ -2121,7 +2184,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 85 }, "_enabled": true, "__prefab": null, @@ -2143,7 +2206,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 85 }, "_enabled": true, "__prefab": null, @@ -2182,7 +2245,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 85 }, "_enabled": true, "__prefab": null, @@ -2212,16 +2275,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 81 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 90 }, { - "__id__": 85 + "__id__": 91 } ], "_prefab": null, @@ -2260,7 +2323,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 89 }, "_enabled": true, "__prefab": null, @@ -2282,7 +2345,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 89 }, "_enabled": true, "__prefab": null, @@ -2321,7 +2384,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -2343,12 +2406,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 81 }, "_enabled": true, "__prefab": null, "_barSprite": { - "__id__": 85 + "__id__": 91 }, "_mode": 0, "_totalLength": 235, @@ -2362,7 +2425,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -2392,16 +2455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 80 }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 96 }, { - "__id__": 91 + "__id__": 97 } ], "_prefab": null, @@ -2440,7 +2503,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 95 }, "_enabled": true, "__prefab": null, @@ -2462,7 +2525,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 95 }, "_enabled": true, "__prefab": null, @@ -2496,6 +2559,29 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 1, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, "_id": "b8o2CHyMhO9KAlJh/3XhyY" }, { @@ -2504,29 +2590,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 80 }, "_children": [ { - "__id__": 93 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 102 }, { - "__id__": 97 + "__id__": 103 }, { - "__id__": 98 + "__id__": 104 }, { - "__id__": 99 + "__id__": 105 }, { - "__id__": 100 + "__id__": 106 } ], "_prefab": null, @@ -2565,16 +2651,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 98 }, "_children": [], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 100 }, { - "__id__": 95 + "__id__": 101 } ], "_prefab": null, @@ -2613,7 +2699,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 99 }, "_enabled": true, "__prefab": null, @@ -2635,7 +2721,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 99 }, "_enabled": true, "__prefab": null, @@ -2669,6 +2755,29 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, "_id": "9dk/u2oGtHEpcYGIirpl0Q" }, { @@ -2677,7 +2786,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 98 }, "_enabled": true, "__prefab": null, @@ -2699,7 +2808,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 98 }, "_enabled": true, "__prefab": null, @@ -2738,7 +2847,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 98 }, "_enabled": true, "__prefab": null, @@ -2792,7 +2901,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 92 + "__id__": 98 }, "_id": "44V8O8mzZKQZv5NNhU9U2X" }, @@ -2802,7 +2911,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 98 }, "_enabled": true, "__prefab": null, @@ -2814,12 +2923,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 98 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 99 + "__id__": 105 }, "_id": "19CfluWQpOB4qddmLDK5n9" }, @@ -2829,20 +2938,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 80 }, "_children": [ { - "__id__": 102 + "__id__": 108 }, { - "__id__": 105 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 114 } ], "_prefab": null, @@ -2881,16 +2990,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 101 + "__id__": 107 }, "_children": [], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 109 }, { - "__id__": 104 + "__id__": 110 } ], "_prefab": null, @@ -2929,7 +3038,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 108 }, "_enabled": true, "__prefab": null, @@ -2951,7 +3060,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 108 }, "_enabled": true, "__prefab": null, @@ -2993,16 +3102,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 101 + "__id__": 107 }, "_children": [], "_active": true, "_components": [ { - "__id__": 106 + "__id__": 112 }, { - "__id__": 107 + "__id__": 113 } ], "_prefab": null, @@ -3041,7 +3150,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 111 }, "_enabled": true, "__prefab": null, @@ -3063,7 +3172,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 111 }, "_enabled": true, "__prefab": null, @@ -3097,6 +3206,29 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, "_id": "a5g867YChPkqWRTiMxmamo" }, { @@ -3105,7 +3237,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 107 }, "_enabled": true, "__prefab": null, @@ -3127,7 +3259,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -3149,7 +3281,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -3179,17 +3311,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 73 + "__id__": 79 }, "_children": [ { - "__id__": 112 + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 119 + "__id__": 125 } ], "_prefab": null, @@ -3228,23 +3360,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 111 + "__id__": 117 }, "_children": [ { - "__id__": 113 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 122 }, { - "__id__": 117 + "__id__": 123 }, { - "__id__": 118 + "__id__": 124 } ], "_prefab": null, @@ -3283,16 +3415,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 112 + "__id__": 118 }, "_children": [], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 120 }, { - "__id__": 115 + "__id__": 121 } ], "_prefab": null, @@ -3331,7 +3463,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 119 }, "_enabled": true, "__prefab": null, @@ -3353,7 +3485,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 119 }, "_enabled": true, "__prefab": null, @@ -3392,7 +3524,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 118 }, "_enabled": true, "__prefab": null, @@ -3414,7 +3546,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 118 }, "_enabled": true, "__prefab": null, @@ -3456,13 +3588,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 118 }, "_enabled": true, "__prefab": null, "maxDistance": 46, "knob": { - "__id__": 113 + "__id__": 119 }, "_id": "50ceZG62tGlYXvZWEvSDKl" }, @@ -3472,7 +3604,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 117 }, "_enabled": true, "__prefab": null, @@ -3494,21 +3626,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 79 }, "_enabled": true, "__prefab": null, "xpBar": { - "__id__": 87 + "__id__": 93 }, "timeAliveText": { - "__id__": 91 + "__id__": 97 }, "goldLabel": { - "__id__": 107 + "__id__": 113 }, "pauseBtn": { - "__id__": 99 + "__id__": 105 }, "_id": "bau/7eItRFrKKoAZZb/uYL" }, @@ -3518,7 +3650,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 79 }, "_enabled": true, "__prefab": null, @@ -3540,16 +3672,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": false, "_components": [ { - "__id__": 123 + "__id__": 129 }, { - "__id__": 124 + "__id__": 130 } ], "_prefab": null, @@ -3588,7 +3720,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 128 }, "_enabled": true, "__prefab": null, @@ -3610,7 +3742,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 128 }, "_enabled": true, "__prefab": null, @@ -3649,7 +3781,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": null, @@ -3671,7 +3803,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": null, @@ -3685,7 +3817,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": null, @@ -3715,50 +3847,50 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": null, "virtualJoystic": { - "__id__": 118 + "__id__": 124 }, "player": null, "haloProjectileLauncherComponent": { - "__id__": 33 - }, - "horizontalProjectileLauncherComponent": { - "__id__": 35 - }, - "diagonalProjectileLauncherComponent": { - "__id__": 37 - }, - "enemyAxeProjectileLauncherComponent": { "__id__": 39 }, - "enemyMagicOrbProjectileLauncherComponent": { + "horizontalProjectileLauncherComponent": { "__id__": 41 }, + "diagonalProjectileLauncherComponent": { + "__id__": 43 + }, + "enemyAxeProjectileLauncherComponent": { + "__id__": 45 + }, + "enemyMagicOrbProjectileLauncherComponent": { + "__id__": 47 + }, "enemyManager": { - "__id__": 69 + "__id__": 75 }, "deathEffectSpawner": { - "__id__": 72 + "__id__": 78 }, "itemManager": { - "__id__": 65 + "__id__": 71 }, "gameUI": { - "__id__": 120 - }, - "gameCanvas": { "__id__": 126 }, + "gameCanvas": { + "__id__": 132 + }, "background": { - "__id__": 31 + "__id__": 37 }, "gameAudioAdapter": null, "blackScreen": { - "__id__": 122 + "__id__": 128 }, "_id": "3a9z1bqlFCGL4/WyDwU4L5" }, @@ -3770,10 +3902,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 130 + "__id__": 136 }, { - "__id__": 132 + "__id__": 138 } ], "nestedPrefabInstanceRoots": [ @@ -3781,27 +3913,27 @@ "__id__": 2 }, { - "__id__": 21 + "__id__": 27 }, { - "__id__": 42 + "__id__": 48 } ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 128 + "__id__": 134 }, "sourceInfo": null, "propertyPath": [ "gameAudioAdapter" ], "target": { - "__id__": 21 + "__id__": 27 }, "targetInfo": { - "__id__": 131 + "__id__": 137 } }, { @@ -3813,17 +3945,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 128 + "__id__": 134 }, "sourceInfo": null, "propertyPath": [ "player" ], "target": { - "__id__": 42 + "__id__": 48 }, "targetInfo": { - "__id__": 133 + "__id__": 139 } }, { @@ -3835,25 +3967,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 135 + "__id__": 141 }, "shadows": { - "__id__": 136 + "__id__": 142 }, "_skybox": { - "__id__": 137 + "__id__": 143 }, "fog": { - "__id__": 138 + "__id__": 144 }, "octree": { - "__id__": 139 + "__id__": 145 }, "skin": { - "__id__": 140 + "__id__": 146 }, "lightProbeInfo": { - "__id__": 141 + "__id__": 147 + }, + "postSettings": { + "__id__": 148 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false @@ -3917,6 +4052,7 @@ "z": 0 }, "_distance": 0, + "_planeBias": 1, "_shadowColor": { "__type__": "cc.Color", "r": 76, @@ -3999,5 +4135,9 @@ "_showConvex": false, "_data": null, "_lightProbeSphereVolume": 1 + }, + { + "__type__": "cc.PostSettingsInfo", + "_toneMappingType": 0 } ] \ No newline at end of file diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index 305ce5a..94848de 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -1,5 +1,5 @@ { - "__version__": "1.0.0", + "__version__": "1.0.1", "information": { "customSplash": { "id": "customSplash",