diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 8ca5b966..e79ea96a 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -22,38 +22,38 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 11 }, { - "__id__": 22 + "__id__": 23 }, { - "__id__": 34 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 46 }, { - "__id__": 47 + "__id__": 48 }, { - "__id__": 49 + "__id__": 50 }, { - "__id__": 51 + "__id__": 52 }, { - "__id__": 53 + "__id__": 54 }, { - "__id__": 55 + "__id__": 56 } ], "_prefab": { - "__id__": 57 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -130,6 +130,9 @@ }, { "__id__": 9 + }, + { + "__id__": 10 } ], "removedComponents": [] @@ -196,6 +199,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "anm", @@ -208,23 +221,23 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 12 }, { - "__id__": 13 + "__id__": 14 }, { - "__id__": 15 + "__id__": 16 }, { - "__id__": 17 + "__id__": 18 }, { - "__id__": 19 + "__id__": 20 } ], "_prefab": { - "__id__": 21 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -241,8 +254,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -261,11 +274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", @@ -289,11 +302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 15 }, "_id": "" }, @@ -307,11 +320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 17 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -355,11 +368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 19 }, "playOnLoad": true, "_clips": [ @@ -420,11 +433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -456,14 +469,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 23 + "__id__": 24 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 22 + "__id__": 23 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -471,7 +484,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 24 + "__id__": 25 }, "targetOverrides": null }, @@ -485,10 +498,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 25 - }, - { - "__id__": 27 + "__id__": 26 }, { "__id__": 28 @@ -503,7 +513,10 @@ "__id__": 31 }, { - "__id__": 33 + "__id__": 32 + }, + { + "__id__": 34 } ], "removedComponents": [] @@ -511,7 +524,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_name" @@ -527,7 +540,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -542,7 +555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -558,7 +571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -573,7 +586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_active" @@ -583,7 +596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 33 }, "propertyPath": [ "_contentSize" @@ -603,7 +616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 26 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -622,14 +635,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 36 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 35 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -637,7 +650,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 37 }, "targetOverrides": null }, @@ -651,10 +664,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 - }, - { - "__id__": 39 + "__id__": 38 }, { "__id__": 40 @@ -666,7 +676,10 @@ "__id__": 42 }, { - "__id__": 44 + "__id__": 43 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -674,7 +687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_name" @@ -690,7 +703,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lpos" @@ -698,14 +711,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 127.867, + "y": 90.171, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lrot" @@ -721,7 +734,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_euler" @@ -736,7 +749,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -757,15 +770,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 39 }, "propertyPath": [ "_lscale" ], "value": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 } }, @@ -779,7 +792,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -807,10 +820,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 49 }, "anm": { - "__id__": 13 + "__id__": 14 }, "_id": "" }, @@ -828,7 +841,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 51 }, "debugMode": false, "_id": "" @@ -847,7 +860,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -881,7 +894,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -915,7 +928,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 57 }, "playOnLoad": false, "_clips": [], @@ -939,10 +952,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 34 + "__id__": 35 }, { - "__id__": 22 + "__id__": 23 }, { "__id__": 2 diff --git a/assets/resources/game/heros/hk1.prefab b/assets/resources/game/heros/hk1.prefab index 7c15f263..83b6fd4d 100644 --- a/assets/resources/game/heros/hk1.prefab +++ b/assets/resources/game/heros/hk1.prefab @@ -123,8 +123,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -577,7 +577,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 125.335, + "y": 94.367, "z": 0 } }, @@ -622,8 +622,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 } }, diff --git a/assets/resources/game/heros/mo1.prefab b/assets/resources/game/heros/mo1.prefab index d0d5c39d..c4c93f9f 100644 --- a/assets/resources/game/heros/mo1.prefab +++ b/assets/resources/game/heros/mo1.prefab @@ -123,8 +123,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -577,7 +577,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 107.768, + "y": 67.911, "z": 0 } }, @@ -643,8 +643,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 1, + "x": 0.6, + "y": 0.7, "z": 1 } }, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index d223768b..864c73a2 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -1347,7 +1347,7 @@ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@9b492", "__expectedType__": "cc.SpriteFrame" }, - "_type": 1, + "_type": 0, "_fillType": 0, "_sizeMode": 0, "_fillCenter": {