diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 69a8c716..cfb36c01 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 44 + }, { "__id__": 46 }, @@ -47,13 +50,10 @@ }, { "__id__": 54 - }, - { - "__id__": 56 } ], "_prefab": { - "__id__": 58 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,7 +242,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.614, "z": 0 }, "_lrot": { @@ -282,8 +282,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -342,7 +342,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -451,8 +451,6 @@ "__id__": 0 }, "fileId": "4aKyovCOhDJpr23Of35+5a", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -670,9 +668,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -739,27 +734,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -785,7 +759,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -813,7 +787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 47 }, "anm": { "__id__": 14 @@ -834,7 +808,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 49 }, "debugMode": false, "_id": "" @@ -853,7 +827,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 51 }, "enabledContactListener": true, "bullet": false, @@ -887,7 +861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -921,7 +895,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 55 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/ha2.prefab b/assets/resources/game/heros/ha2.prefab index 9a016293..fb25fe19 100644 --- a/assets/resources/game/heros/ha2.prefab +++ b/assets/resources/game/heros/ha2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 44 + }, { "__id__": 46 }, @@ -44,13 +47,10 @@ }, { "__id__": 52 - }, - { - "__id__": 54 } ], "_prefab": { - "__id__": 56 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,7 +239,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.991, "z": 0 }, "_lrot": { @@ -279,8 +279,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -339,7 +339,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -667,9 +667,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -736,27 +733,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -782,7 +758,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -810,7 +786,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 47 }, "anm": { "__id__": 14 @@ -831,7 +807,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 49 }, "debugMode": false, "_id": "" @@ -850,7 +826,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 51 }, "enabledContactListener": true, "bullet": false, @@ -884,7 +860,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 53 }, "tag": 0, "_group": 4, diff --git a/assets/resources/game/heros/ha3.prefab b/assets/resources/game/heros/ha3.prefab index d0af61f3..3f7ee88b 100644 --- a/assets/resources/game/heros/ha3.prefab +++ b/assets/resources/game/heros/ha3.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 44 + }, { "__id__": 46 }, @@ -47,13 +50,10 @@ }, { "__id__": 54 - }, - { - "__id__": 56 } ], "_prefab": { - "__id__": 58 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,7 +242,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.991, "z": 0 }, "_lrot": { @@ -282,8 +282,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -342,7 +342,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -673,9 +673,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -742,27 +739,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -788,7 +764,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -816,7 +792,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 47 }, "anm": { "__id__": 14 @@ -837,7 +813,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 49 }, "debugMode": false, "_id": "" @@ -856,7 +832,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 51 }, "enabledContactListener": true, "bullet": false, @@ -890,7 +866,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -924,7 +900,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 55 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/ha4.prefab b/assets/resources/game/heros/ha4.prefab index 09e06906..66fd0ee2 100644 --- a/assets/resources/game/heros/ha4.prefab +++ b/assets/resources/game/heros/ha4.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.706, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,12 +748,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 6 + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hc1.prefab b/assets/resources/game/heros/hc1.prefab index 16870c9d..ee19e01c 100644 --- a/assets/resources/game/heros/hc1.prefab +++ b/assets/resources/game/heros/hc1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hc2.prefab b/assets/resources/game/heros/hc2.prefab index 804ffed1..9272cdca 100644 --- a/assets/resources/game/heros/hc2.prefab +++ b/assets/resources/game/heros/hc2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.278, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hh1.prefab b/assets/resources/game/heros/hh1.prefab index bdf8846f..c3c17ca9 100644 --- a/assets/resources/game/heros/hh1.prefab +++ b/assets/resources/game/heros/hh1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hh2.prefab b/assets/resources/game/heros/hh2.prefab index 37e2d434..3cec6936 100644 --- a/assets/resources/game/heros/hh2.prefab +++ b/assets/resources/game/heros/hh2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.706, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hk1.prefab b/assets/resources/game/heros/hk1.prefab index 77f6806a..53d170b7 100644 --- a/assets/resources/game/heros/hk1.prefab +++ b/assets/resources/game/heros/hk1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hk2.prefab b/assets/resources/game/heros/hk2.prefab index 02c0321c..8c4673de 100644 --- a/assets/resources/game/heros/hk2.prefab +++ b/assets/resources/game/heros/hk2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 48 + }, { "__id__": 50 }, @@ -47,13 +50,10 @@ }, { "__id__": 58 - }, - { - "__id__": 60 } ], "_prefab": { - "__id__": 62 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -266,7 +266,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -27.031, + "y": -39.279, "z": 0 }, "_lrot": { @@ -306,8 +306,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -366,7 +366,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -694,9 +694,6 @@ }, { "__id__": 47 - }, - { - "__id__": 49 } ], "removedComponents": [] @@ -763,27 +760,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 48 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -809,7 +785,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -837,7 +813,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 51 }, "anm": { "__id__": 18 @@ -858,7 +834,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 53 }, "debugMode": false, "_id": "" @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 55 }, "enabledContactListener": true, "bullet": false, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 57 }, "tag": 0, "_group": 4, @@ -945,7 +921,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 59 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hk3.prefab b/assets/resources/game/heros/hk3.prefab index 94b25e42..7593a429 100644 --- a/assets/resources/game/heros/hk3.prefab +++ b/assets/resources/game/heros/hk3.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.706, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hk4.prefab b/assets/resources/game/heros/hk4.prefab index aea1d70d..df7996cb 100644 --- a/assets/resources/game/heros/hk4.prefab +++ b/assets/resources/game/heros/hk4.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 128 + "width": 192, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hk5.prefab b/assets/resources/game/heros/hk5.prefab index bf0e4c5b..2410440e 100644 --- a/assets/resources/game/heros/hk5.prefab +++ b/assets/resources/game/heros/hk5.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.991, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hm1.prefab b/assets/resources/game/heros/hm1.prefab index 95cb499f..2482f02c 100644 --- a/assets/resources/game/heros/hm1.prefab +++ b/assets/resources/game/heros/hm1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hm2.prefab b/assets/resources/game/heros/hm2.prefab index 908f86c8..b3726079 100644 --- a/assets/resources/game/heros/hm2.prefab +++ b/assets/resources/game/heros/hm2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -890,7 +866,7 @@ "_size": { "__type__": "cc.Size", "width": 30, - "height": 6 + "height": 60 }, "_id": "" }, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hm3.prefab b/assets/resources/game/heros/hm3.prefab index 2b4e8956..c8492b12 100644 --- a/assets/resources/game/heros/hm3.prefab +++ b/assets/resources/game/heros/hm3.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hm4.prefab b/assets/resources/game/heros/hm4.prefab index 4451f55f..618870f6 100644 --- a/assets/resources/game/heros/hm4.prefab +++ b/assets/resources/game/heros/hm4.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/hm5.prefab b/assets/resources/game/heros/hm5.prefab index 7e738d12..ed55d03a 100644 --- a/assets/resources/game/heros/hm5.prefab +++ b/assets/resources/game/heros/hm5.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m1.prefab b/assets/resources/game/heros/m1.prefab index 183957a4..9e4cc4a8 100644 --- a/assets/resources/game/heros/m1.prefab +++ b/assets/resources/game/heros/m1.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.706, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m2.prefab b/assets/resources/game/heros/m2.prefab index 47353ad0..e88fa932 100644 --- a/assets/resources/game/heros/m2.prefab +++ b/assets/resources/game/heros/m2.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.278, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m3.prefab b/assets/resources/game/heros/m3.prefab index a6b6fd03..68579763 100644 --- a/assets/resources/game/heros/m3.prefab +++ b/assets/resources/game/heros/m3.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m4.prefab b/assets/resources/game/heros/m4.prefab index 417d2873..af1244cf 100644 --- a/assets/resources/game/heros/m4.prefab +++ b/assets/resources/game/heros/m4.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.134, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m5.prefab b/assets/resources/game/heros/m5.prefab index 12d2e0e7..9e98c050 100644 --- a/assets/resources/game/heros/m5.prefab +++ b/assets/resources/game/heros/m5.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -34.421, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m6.prefab b/assets/resources/game/heros/m6.prefab index bd8ee18c..5563fb7a 100644 --- a/assets/resources/game/heros/m6.prefab +++ b/assets/resources/game/heros/m6.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -34.849, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m7.prefab b/assets/resources/game/heros/m7.prefab index ae9dc657..0c0c4c4d 100644 --- a/assets/resources/game/heros/m7.prefab +++ b/assets/resources/game/heros/m7.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.706, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -657,9 +657,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -726,27 +723,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -772,7 +748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -800,7 +776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -821,7 +797,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -840,7 +816,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -874,7 +850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -908,7 +884,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m8.prefab b/assets/resources/game/heros/m8.prefab index b55308f8..f1690e32 100644 --- a/assets/resources/game/heros/m8.prefab +++ b/assets/resources/game/heros/m8.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 43 + }, { "__id__": 45 }, @@ -47,13 +50,10 @@ }, { "__id__": 53 - }, - { - "__id__": 55 } ], "_prefab": { - "__id__": 57 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,7 +229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -36.562, "z": 0 }, "_lrot": { @@ -269,8 +269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -329,7 +329,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -660,9 +660,6 @@ }, { "__id__": 42 - }, - { - "__id__": 44 } ], "removedComponents": [] @@ -729,27 +726,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -775,7 +751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -803,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "anm": { "__id__": 13 @@ -824,7 +800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "debugMode": false, "_id": "" @@ -843,7 +819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "enabledContactListener": true, "bullet": false, @@ -877,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "tag": 0, "_group": 4, @@ -911,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 54 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/m9.prefab b/assets/resources/game/heros/m9.prefab index c57d7719..ac8b6ff5 100644 --- a/assets/resources/game/heros/m9.prefab +++ b/assets/resources/game/heros/m9.prefab @@ -33,6 +33,9 @@ ], "_active": true, "_components": [ + { + "__id__": 41 + }, { "__id__": 43 }, @@ -47,13 +50,10 @@ }, { "__id__": 51 - }, - { - "__id__": 53 } ], "_prefab": { - "__id__": 55 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -226,7 +226,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -35.278, "z": 0 }, "_lrot": { @@ -266,8 +266,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 160, + "height": 160 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -326,7 +326,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -612,9 +612,6 @@ }, { "__id__": 40 - }, - { - "__id__": 42 } ], "removedComponents": [] @@ -681,27 +678,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -727,7 +703,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -755,7 +731,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 44 }, "anm": { "__id__": 13 @@ -776,7 +752,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 46 }, "debugMode": false, "_id": "" @@ -795,7 +771,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 48 }, "enabledContactListener": true, "bullet": false, @@ -829,7 +805,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 50 }, "tag": 0, "_group": 4, @@ -863,7 +839,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 52 }, "playOnLoad": false, "_clips": [], diff --git a/assets/resources/game/heros/mb1.prefab b/assets/resources/game/heros/mb1.prefab index 321c3893..4c0af7cc 100644 --- a/assets/resources/game/heros/mb1.prefab +++ b/assets/resources/game/heros/mb1.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -85.933, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -684,9 +684,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -753,27 +750,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -796,14 +772,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -811,7 +787,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -824,9 +800,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -836,17 +818,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -854,7 +830,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -870,7 +846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -885,7 +861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -901,7 +877,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -916,7 +892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -931,7 +907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -954,7 +930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -977,7 +953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -1001,7 +977,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1029,7 +1005,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1050,7 +1026,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1069,7 +1045,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1103,7 +1079,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1137,7 +1113,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1161,7 +1137,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/mb2.prefab b/assets/resources/game/heros/mb2.prefab index 2b332084..b829489a 100644 --- a/assets/resources/game/heros/mb2.prefab +++ b/assets/resources/game/heros/mb2.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -88.321, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -684,9 +684,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -753,27 +750,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -796,14 +772,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -811,7 +787,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -824,9 +800,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -836,17 +818,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -854,7 +830,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -870,7 +846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -885,7 +861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -901,7 +877,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -916,7 +892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -931,7 +907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -954,7 +930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -977,7 +953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -1001,7 +977,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1029,7 +1005,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1050,7 +1026,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1069,7 +1045,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1103,7 +1079,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1137,7 +1113,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1161,7 +1137,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/mb3.prefab b/assets/resources/game/heros/mb3.prefab index 1ea38b6c..9748fec0 100644 --- a/assets/resources/game/heros/mb3.prefab +++ b/assets/resources/game/heros/mb3.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -84.866, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -681,9 +681,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -750,27 +747,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -793,14 +769,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -808,7 +784,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -821,9 +797,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -833,17 +815,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -851,7 +827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -867,7 +843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -882,7 +858,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -898,7 +874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -913,7 +889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -928,7 +904,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -951,7 +927,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -974,7 +950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -998,7 +974,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1026,7 +1002,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1047,7 +1023,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1066,7 +1042,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1100,7 +1076,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1134,7 +1110,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1158,7 +1134,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/mb4.prefab b/assets/resources/game/heros/mb4.prefab index 3dec909d..f97a3efd 100644 --- a/assets/resources/game/heros/mb4.prefab +++ b/assets/resources/game/heros/mb4.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -84.192, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -684,9 +684,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -753,27 +750,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -796,14 +772,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -811,7 +787,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -824,9 +800,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -836,17 +818,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -854,7 +830,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -870,7 +846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -885,7 +861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -901,7 +877,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -916,7 +892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -931,7 +907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -954,7 +930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -977,7 +953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -1001,7 +977,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1029,7 +1005,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1050,7 +1026,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1069,7 +1045,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1103,7 +1079,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1137,7 +1113,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1161,7 +1137,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/mb5.prefab b/assets/resources/game/heros/mb5.prefab index 0efc9d78..cf58feab 100644 --- a/assets/resources/game/heros/mb5.prefab +++ b/assets/resources/game/heros/mb5.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -87.202, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -681,9 +681,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -750,27 +747,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -793,14 +769,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -808,7 +784,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -821,9 +797,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -833,17 +815,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -851,7 +827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -867,7 +843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -882,7 +858,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -898,7 +874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -913,7 +889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -928,7 +904,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -951,7 +927,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -974,7 +950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -998,7 +974,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", @@ -1026,7 +1002,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1047,7 +1023,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1066,7 +1042,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1100,7 +1076,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1134,7 +1110,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1158,7 +1134,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/mb6.prefab b/assets/resources/game/heros/mb6.prefab index dff8b82c..a62c8cc8 100644 --- a/assets/resources/game/heros/mb6.prefab +++ b/assets/resources/game/heros/mb6.prefab @@ -31,11 +31,14 @@ "__id__": 35 }, { - "__id__": 46 + "__id__": 44 } ], "_active": true, "_components": [ + { + "__id__": 59 + }, { "__id__": 61 }, @@ -50,13 +53,10 @@ }, { "__id__": 69 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,7 +250,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -39.719, + "y": -81.733, "z": 0 }, "_lrot": { @@ -262,8 +262,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1.5, - "y": 1.5, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -290,8 +290,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 128 + "width": 384, + "height": 384 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -353,7 +353,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -681,9 +681,6 @@ }, { "__id__": 43 - }, - { - "__id__": 45 } ], "removedComponents": [] @@ -715,7 +712,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 143.701, + "y": 264.684, "z": 0 } }, @@ -750,27 +747,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 44 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -781,8 +757,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 } }, @@ -793,14 +769,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 45 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 44 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -808,7 +784,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 48 + "__id__": 46 }, "targetOverrides": null }, @@ -821,9 +797,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 47 + }, { "__id__": 49 }, + { + "__id__": 50 + }, { "__id__": 51 }, @@ -833,17 +815,11 @@ { "__id__": 53 }, - { - "__id__": 54 - }, { "__id__": 55 }, { "__id__": 57 - }, - { - "__id__": 59 } ], "removedComponents": [] @@ -851,7 +827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_name" @@ -867,7 +843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -882,7 +858,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -898,7 +874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -913,7 +889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 48 }, "propertyPath": [ "_lscale" @@ -928,7 +904,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 54 }, "propertyPath": [ "_color" @@ -951,7 +927,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 56 }, "propertyPath": [ "_color" @@ -974,7 +950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 58 }, "propertyPath": [ "_active" @@ -998,12 +974,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 60 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 130 + "width": 200, + "height": 220 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1026,7 +1002,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 62 }, "anm": { "__id__": 14 @@ -1047,7 +1023,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 64 }, "debugMode": false, "_id": "" @@ -1066,7 +1042,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 66 }, "enabledContactListener": true, "bullet": false, @@ -1100,7 +1076,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 68 }, "tag": 0, "_group": 4, @@ -1111,12 +1087,12 @@ "_offset": { "__type__": "cc.Vec2", "x": 0, - "y": 50 + "y": 110 }, "_size": { "__type__": "cc.Size", - "width": 30, - "height": 100 + "width": 150, + "height": 220 }, "_id": "" }, @@ -1134,7 +1110,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 70 }, "playOnLoad": false, "_clips": [], @@ -1158,7 +1134,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 46 + "__id__": 44 }, { "__id__": 35 diff --git a/assets/resources/game/heros/top.prefab b/assets/resources/game/heros/top.prefab index cf475089..8c03d0b6 100644 --- a/assets/resources/game/heros/top.prefab +++ b/assets/resources/game/heros/top.prefab @@ -112,7 +112,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -7.84, + "y": -6.16, "z": 0 }, "_lrot": { @@ -736,7 +736,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 45, - "height": 8 + "height": 7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -914,7 +914,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 156.66666666666669, - "height": 33.333333333333336 + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1039,7 +1039,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 45, - "height": 8 + "height": 7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1569,7 +1569,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 45, - "height": 8 + "height": 7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2484,8 +2484,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -15, - "y": 7.5, + "x": -11.499999999999998, + "y": 11, "z": 0 }, "_lrot": { @@ -2525,8 +2525,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2620,8 +2620,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 7.5, + "x": 10.400000000000002, + "y": 11, "z": 0 }, "_lrot": { @@ -2661,8 +2661,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2756,8 +2756,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 15, - "y": 7.5, + "x": -11.5, + "y": 34, "z": 0 }, "_lrot": { @@ -2797,8 +2797,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2892,8 +2892,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -15, - "y": 22.5, + "x": 10.4, + "y": 34, "z": 0 }, "_lrot": { @@ -2933,8 +2933,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3028,8 +3028,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 22.5, + "x": -11.5, + "y": 57, "z": 0 }, "_lrot": { @@ -3069,8 +3069,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3164,8 +3164,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 15, - "y": 22.5, + "x": 10.4, + "y": 57, "z": 0 }, "_lrot": { @@ -3205,8 +3205,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3300,8 +3300,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -15, - "y": 37.5, + "x": -11.5, + "y": 80, "z": 0 }, "_lrot": { @@ -3341,8 +3341,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3436,8 +3436,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 37.5, + "x": 10.4, + "y": 80, "z": 0 }, "_lrot": { @@ -3477,8 +3477,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 22, + "height": 22 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3637,8 +3637,8 @@ "_paddingRight": 0, "_paddingTop": 0, "_paddingBottom": 0, - "_spacingX": 0, - "_spacingY": 0, + "_spacingX": -0.1, + "_spacingY": 1, "_verticalDirection": 0, "_horizontalDirection": 0, "_constraint": 0, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 24a4b44c..d7d44f8b 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -2352,7 +2352,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -150, + "y": -155, "z": 0 }, "_lrot": {