From 00148863adc1ae9e00af63ba1142403e75b45554 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 2 Feb 2025 16:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=89=A9=E7=90=86=E7=A2=B0?= =?UTF-8?q?=E6=92=9E=E7=BB=84=E4=BB=B6=EF=BC=8C=E8=8B=B1=E9=9B=84=E7=9A=84?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=94=B9=E7=94=B1=E7=B3=BB=E7=BB=9F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/heros/k1.prefab | 82 +---------- assets/resources/game/heros/k2.prefab | 82 +---------- assets/resources/game/heros/k5.prefab | 82 +---------- assets/resources/game/heros/m4.prefab | 82 +---------- assets/resources/game/heros/md1.prefab | 82 +---------- assets/resources/game/heros/md2.prefab | 82 +---------- assets/resources/game/heros/md3.prefab | 82 +---------- assets/resources/game/heros/md4.prefab | 82 +---------- assets/resources/game/heros/mgem1.prefab | 82 +---------- assets/resources/game/heros/mgem2.prefab | 82 +---------- assets/resources/game/heros/mgem3.prefab | 82 +---------- assets/resources/game/heros/mkl1.prefab | 82 +---------- assets/resources/game/heros/mkl2.prefab | 82 +---------- assets/resources/game/heros/mkl3.prefab | 82 +---------- assets/resources/game/heros/mkl4.prefab | 82 +---------- assets/resources/game/heros/mkl5.prefab | 82 +---------- assets/resources/game/heros/mkl6.prefab | 82 +---------- assets/resources/game/heros/mkla1.prefab | 82 +---------- assets/resources/game/heros/mkla2.prefab | 82 +---------- assets/resources/game/heros/mkla3.prefab | 82 +---------- assets/resources/game/heros/mn1.prefab | 47 +----- assets/resources/game/heros/mn2.prefab | 47 +----- assets/resources/game/heros/mn3.prefab | 82 +---------- assets/resources/game/heros/mn4.prefab | 82 +---------- assets/resources/game/heros/mor1.prefab | 82 +---------- assets/resources/game/heros/mor2.prefab | 82 +---------- assets/resources/game/heros/mor3.prefab | 82 +---------- assets/resources/game/heros/mor4.prefab | 82 +---------- assets/resources/game/heros/my1.prefab | 82 +---------- assets/resources/game/heros/my2.prefab | 82 +---------- assets/resources/game/heros/my3.prefab | 82 +---------- assets/resources/game/heros/zh1.prefab | 82 +---------- assets/resources/game/heros/zh2.prefab | 82 +---------- assets/resources/game/skills/apup.prefab | 82 +---------- assets/resources/game/skills/arrow.prefab | 82 +---------- .../resources/game/skills/arrow_blue.prefab | 84 +---------- .../resources/game/skills/arrow_yellow.prefab | 84 +---------- assets/resources/game/skills/ball_blue.prefab | 84 +---------- .../resources/game/skills/ball_green.prefab | 84 +---------- assets/resources/game/skills/ball_red.prefab | 84 +---------- .../resources/game/skills/ball_yellow.prefab | 84 +---------- assets/resources/game/skills/bingyu.prefab | 82 +---------- assets/resources/game/skills/buff_all.prefab | 80 +--------- assets/resources/game/skills/buff_do.prefab | 80 +--------- assets/resources/game/skills/buff_do2.prefab | 80 +--------- assets/resources/game/skills/buffto.prefab | 82 +---------- assets/resources/game/skills/bwind.prefab | 82 +---------- assets/resources/game/skills/cuida.prefab | 80 +--------- assets/resources/game/skills/debuff.prefab | 82 +---------- assets/resources/game/skills/dianquan.prefab | 84 +---------- assets/resources/game/skills/fire.prefab | 84 +---------- assets/resources/game/skills/fireball.prefab | 82 +---------- assets/resources/game/skills/firequan.prefab | 84 +---------- assets/resources/game/skills/fireto.prefab | 80 +--------- assets/resources/game/skills/firewall.prefab | 84 +---------- assets/resources/game/skills/fireys.prefab | 82 +---------- assets/resources/game/skills/flash.prefab | 80 +--------- assets/resources/game/skills/fwind.prefab | 84 +---------- assets/resources/game/skills/heath.prefab | 86 +---------- assets/resources/game/skills/heath2.prefab | 84 +---------- .../resources/game/skills/heath_small.prefab | 82 +---------- assets/resources/game/skills/ice.prefab | 84 +---------- assets/resources/game/skills/icet.prefab | 84 +---------- assets/resources/game/skills/icez.prefab | 82 +---------- assets/resources/game/skills/kingba.prefab | 80 +--------- assets/resources/game/skills/mon_ft.prefab | 84 +---------- assets/resources/game/skills/mon_ly.prefab | 84 +---------- assets/resources/game/skills/mon_sf.prefab | 84 +---------- assets/resources/game/skills/mon_xd.prefab | 84 +---------- assets/resources/game/skills/patk.prefab | 80 +--------- assets/resources/game/skills/shield.prefab | 82 +---------- assets/resources/game/skills/shoot1.prefab | 84 +---------- assets/resources/game/skills/shoot2.prefab | 84 +---------- assets/script/Main.ts | 7 - assets/script/game/common/config/heroSet.ts | 72 ++++----- .../ecs/position/BattleMoveComp.ts.meta | 9 ++ .../common/ecs/position/BattleMoveSystem.ts | 30 +++- .../ecs/position/BattleMoveSystem.ts.meta | 9 ++ .../common/ecs/position/EcsPositionSystem.ts | 2 + assets/script/game/hero/HeroViewComp.ts | 138 +----------------- assets/script/game/skills/SkillCom.ts | 14 -- settings/v2/packages/engine.json | 3 +- 82 files changed, 397 insertions(+), 5831 deletions(-) create mode 100644 assets/script/game/common/ecs/position/BattleMoveComp.ts.meta create mode 100644 assets/script/game/common/ecs/position/BattleMoveSystem.ts.meta diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab index f5b7b69a..4bfca6c6 100644 --- a/assets/resources/game/heros/k1.prefab +++ b/assets/resources/game/heros/k1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 90 - }, - { - "__id__": 92 - }, - { - "__id__": 94 } ], "_prefab": { - "__id__": 96 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -1365,74 +1359,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 87 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1443,7 +1369,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 87 }, "anm": { "__id__": 22 @@ -1464,7 +1390,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "_id": "" }, @@ -1482,7 +1408,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 91 }, "_id": "" }, diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab index 4178667f..3b7f2ddd 100644 --- a/assets/resources/game/heros/k2.prefab +++ b/assets/resources/game/heros/k2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/k5.prefab b/assets/resources/game/heros/k5.prefab index 11a72cc1..4bd54880 100644 --- a/assets/resources/game/heros/k5.prefab +++ b/assets/resources/game/heros/k5.prefab @@ -59,16 +59,10 @@ }, { "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 } ], "_prefab": { - "__id__": 98 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1384,74 +1378,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 91 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1462,7 +1388,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "anm": { "__id__": 22 @@ -1483,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 91 }, "_id": "" }, @@ -1501,7 +1427,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 93 }, "_id": "" }, diff --git a/assets/resources/game/heros/m4.prefab b/assets/resources/game/heros/m4.prefab index d05eace1..5e0c12c4 100644 --- a/assets/resources/game/heros/m4.prefab +++ b/assets/resources/game/heros/m4.prefab @@ -59,16 +59,10 @@ }, { "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 } ], "_prefab": { - "__id__": 98 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1384,74 +1378,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 91 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1462,7 +1388,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "anm": { "__id__": 22 @@ -1483,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 91 }, "_id": "" }, @@ -1501,7 +1427,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 93 }, "_id": "" }, diff --git a/assets/resources/game/heros/md1.prefab b/assets/resources/game/heros/md1.prefab index 193b6686..bc43a276 100644 --- a/assets/resources/game/heros/md1.prefab +++ b/assets/resources/game/heros/md1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/md2.prefab b/assets/resources/game/heros/md2.prefab index 3b6c89a2..fe07c47f 100644 --- a/assets/resources/game/heros/md2.prefab +++ b/assets/resources/game/heros/md2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/md3.prefab b/assets/resources/game/heros/md3.prefab index f6297ae2..438cba20 100644 --- a/assets/resources/game/heros/md3.prefab +++ b/assets/resources/game/heros/md3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/md4.prefab b/assets/resources/game/heros/md4.prefab index 3d53751d..f590c093 100644 --- a/assets/resources/game/heros/md4.prefab +++ b/assets/resources/game/heros/md4.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mgem1.prefab b/assets/resources/game/heros/mgem1.prefab index 4b83748f..fe5c90aa 100644 --- a/assets/resources/game/heros/mgem1.prefab +++ b/assets/resources/game/heros/mgem1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mgem2.prefab b/assets/resources/game/heros/mgem2.prefab index 3bfcb961..a65571a4 100644 --- a/assets/resources/game/heros/mgem2.prefab +++ b/assets/resources/game/heros/mgem2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mgem3.prefab b/assets/resources/game/heros/mgem3.prefab index 502a7c33..30c327ab 100644 --- a/assets/resources/game/heros/mgem3.prefab +++ b/assets/resources/game/heros/mgem3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl1.prefab b/assets/resources/game/heros/mkl1.prefab index e23b736f..f447ab47 100644 --- a/assets/resources/game/heros/mkl1.prefab +++ b/assets/resources/game/heros/mkl1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl2.prefab b/assets/resources/game/heros/mkl2.prefab index 6e60bcb9..0d776d8c 100644 --- a/assets/resources/game/heros/mkl2.prefab +++ b/assets/resources/game/heros/mkl2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl3.prefab b/assets/resources/game/heros/mkl3.prefab index df1647d2..f58e437d 100644 --- a/assets/resources/game/heros/mkl3.prefab +++ b/assets/resources/game/heros/mkl3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl4.prefab b/assets/resources/game/heros/mkl4.prefab index 8bbfd74d..10ebfa9b 100644 --- a/assets/resources/game/heros/mkl4.prefab +++ b/assets/resources/game/heros/mkl4.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl5.prefab b/assets/resources/game/heros/mkl5.prefab index 693e6cb3..06f982b7 100644 --- a/assets/resources/game/heros/mkl5.prefab +++ b/assets/resources/game/heros/mkl5.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkl6.prefab b/assets/resources/game/heros/mkl6.prefab index 5495dde8..7348f1f6 100644 --- a/assets/resources/game/heros/mkl6.prefab +++ b/assets/resources/game/heros/mkl6.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkla1.prefab b/assets/resources/game/heros/mkla1.prefab index 17149bd0..2eef68c9 100644 --- a/assets/resources/game/heros/mkla1.prefab +++ b/assets/resources/game/heros/mkla1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkla2.prefab b/assets/resources/game/heros/mkla2.prefab index c180cc7d..18508415 100644 --- a/assets/resources/game/heros/mkla2.prefab +++ b/assets/resources/game/heros/mkla2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mkla3.prefab b/assets/resources/game/heros/mkla3.prefab index 806e31c8..05d85c88 100644 --- a/assets/resources/game/heros/mkla3.prefab +++ b/assets/resources/game/heros/mkla3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mn1.prefab b/assets/resources/game/heros/mn1.prefab index fc3c61ca..5f2e4b2d 100644 --- a/assets/resources/game/heros/mn1.prefab +++ b/assets/resources/game/heros/mn1.prefab @@ -62,13 +62,10 @@ }, { "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,40 +1349,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, { "__type__": "cc.BoxCollider2D", "_name": "", @@ -1396,7 +1359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 86 }, "tag": 0, "_group": 4, @@ -1430,7 +1393,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 88 }, "anm": { "__id__": 22 @@ -1451,7 +1414,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 90 }, "_id": "" }, @@ -1469,7 +1432,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 92 }, "_id": "" }, diff --git a/assets/resources/game/heros/mn2.prefab b/assets/resources/game/heros/mn2.prefab index 06907059..7c36870c 100644 --- a/assets/resources/game/heros/mn2.prefab +++ b/assets/resources/game/heros/mn2.prefab @@ -62,13 +62,10 @@ }, { "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,40 +1349,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, { "__type__": "cc.BoxCollider2D", "_name": "", @@ -1396,7 +1359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 86 }, "tag": 0, "_group": 4, @@ -1430,7 +1393,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 88 }, "anm": { "__id__": 22 @@ -1451,7 +1414,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 90 }, "_id": "" }, @@ -1469,7 +1432,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 92 }, "_id": "" }, diff --git a/assets/resources/game/heros/mn3.prefab b/assets/resources/game/heros/mn3.prefab index 26f9c52b..f5fffd11 100644 --- a/assets/resources/game/heros/mn3.prefab +++ b/assets/resources/game/heros/mn3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mn4.prefab b/assets/resources/game/heros/mn4.prefab index f2386e74..0cf10f00 100644 --- a/assets/resources/game/heros/mn4.prefab +++ b/assets/resources/game/heros/mn4.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab index 2298ec9a..c0e2623f 100644 --- a/assets/resources/game/heros/mor1.prefab +++ b/assets/resources/game/heros/mor1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab index b948607a..1f41f3bb 100644 --- a/assets/resources/game/heros/mor2.prefab +++ b/assets/resources/game/heros/mor2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab index e533da22..08f7367b 100644 --- a/assets/resources/game/heros/mor3.prefab +++ b/assets/resources/game/heros/mor3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/mor4.prefab b/assets/resources/game/heros/mor4.prefab index 255622e7..e17869b4 100644 --- a/assets/resources/game/heros/mor4.prefab +++ b/assets/resources/game/heros/mor4.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/my1.prefab b/assets/resources/game/heros/my1.prefab index 2045a13b..d4618dc1 100644 --- a/assets/resources/game/heros/my1.prefab +++ b/assets/resources/game/heros/my1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/my2.prefab b/assets/resources/game/heros/my2.prefab index d37b53f7..eff9d96b 100644 --- a/assets/resources/game/heros/my2.prefab +++ b/assets/resources/game/heros/my2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/my3.prefab b/assets/resources/game/heros/my3.prefab index c4a862ef..bc0d5eaf 100644 --- a/assets/resources/game/heros/my3.prefab +++ b/assets/resources/game/heros/my3.prefab @@ -59,16 +59,10 @@ }, { "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 } ], "_prefab": { - "__id__": 95 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -1352,74 +1346,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 86 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 88 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1430,7 +1356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 86 }, "anm": { "__id__": 22 @@ -1451,7 +1377,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 88 }, "_id": "" }, @@ -1469,7 +1395,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 90 }, "_id": "" }, diff --git a/assets/resources/game/heros/zh1.prefab b/assets/resources/game/heros/zh1.prefab index d1e89198..f4a765e6 100644 --- a/assets/resources/game/heros/zh1.prefab +++ b/assets/resources/game/heros/zh1.prefab @@ -59,16 +59,10 @@ }, { "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 } ], "_prefab": { - "__id__": 98 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1384,74 +1378,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 91 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1462,7 +1388,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "anm": { "__id__": 22 @@ -1483,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 91 }, "_id": "" }, @@ -1501,7 +1427,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 93 }, "_id": "" }, diff --git a/assets/resources/game/heros/zh2.prefab b/assets/resources/game/heros/zh2.prefab index 13d9c325..f3e249c2 100644 --- a/assets/resources/game/heros/zh2.prefab +++ b/assets/resources/game/heros/zh2.prefab @@ -59,16 +59,10 @@ }, { "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 } ], "_prefab": { - "__id__": 98 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1384,74 +1378,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14OhXRCixNOaApgow/hFbp" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 89 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8rVs6intBQ7lRU8Dw4zXV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 91 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": false, - "_friction": 1, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -1.8, - "y": 37.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 50.8, - "height": 78.6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2Dt9lJI9FyJCDezkDBPBl" - }, { "__type__": "a0379fmhvBHcbNcBF/l43O8", "_name": "", @@ -1462,7 +1388,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "anm": { "__id__": 22 @@ -1483,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 91 }, "_id": "" }, @@ -1501,7 +1427,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 93 }, "_id": "" }, diff --git a/assets/resources/game/skills/apup.prefab b/assets/resources/game/skills/apup.prefab index 549f3616..9432b62e 100644 --- a/assets/resources/game/skills/apup.prefab +++ b/assets/resources/game/skills/apup.prefab @@ -38,16 +38,10 @@ }, { "__id__": 26 - }, - { - "__id__": 28 - }, - { - "__id__": 30 } ], "_prefab": { - "__id__": 32 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", @@ -407,74 +401,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 720, - "height": 60 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -485,7 +411,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_id": "" }, @@ -503,7 +429,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 25 }, "playOnLoad": true, "_clips": [ @@ -532,7 +458,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 27 }, "_id": "" }, diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index 3ac97990..e9b6637c 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -2.1, - "y": 0.4 - }, - "_size": { - "__type__": "cc.Size", - "width": 10, - "height": 10 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/arrow_blue.prefab b/assets/resources/game/skills/arrow_blue.prefab index 1832ed9a..cff4c531 100644 --- a/assets/resources/game/skills/arrow_blue.prefab +++ b/assets/resources/game/skills/arrow_blue.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -364,7 +290,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -382,7 +308,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/arrow_yellow.prefab b/assets/resources/game/skills/arrow_yellow.prefab index 95fed3b1..4fb5f0d8 100644 --- a/assets/resources/game/skills/arrow_yellow.prefab +++ b/assets/resources/game/skills/arrow_yellow.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -364,7 +290,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -382,7 +308,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/ball_blue.prefab b/assets/resources/game/skills/ball_blue.prefab index c3070456..db92f789 100644 --- a/assets/resources/game/skills/ball_blue.prefab +++ b/assets/resources/game/skills/ball_blue.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -4.5, - "y": -2 - }, - "_size": { - "__type__": "cc.Size", - "width": 20, - "height": 30.1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/ball_green.prefab b/assets/resources/game/skills/ball_green.prefab index 99254945..7599c46d 100644 --- a/assets/resources/game/skills/ball_green.prefab +++ b/assets/resources/game/skills/ball_green.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -4.5, - "y": -2 - }, - "_size": { - "__type__": "cc.Size", - "width": 20, - "height": 30.1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/ball_red.prefab b/assets/resources/game/skills/ball_red.prefab index dd775747..ff615ccb 100644 --- a/assets/resources/game/skills/ball_red.prefab +++ b/assets/resources/game/skills/ball_red.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -4.5, - "y": -2 - }, - "_size": { - "__type__": "cc.Size", - "width": 20, - "height": 30.1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/ball_yellow.prefab b/assets/resources/game/skills/ball_yellow.prefab index 666ba4e2..ad76e6a8 100644 --- a/assets/resources/game/skills/ball_yellow.prefab +++ b/assets/resources/game/skills/ball_yellow.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -4.5, - "y": -2 - }, - "_size": { - "__type__": "cc.Size", - "width": 20, - "height": 30.1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/bingyu.prefab b/assets/resources/game/skills/bingyu.prefab index 94444e31..c636f8b5 100644 --- a/assets/resources/game/skills/bingyu.prefab +++ b/assets/resources/game/skills/bingyu.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 180, - "height": 10 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/buff_all.prefab b/assets/resources/game/skills/buff_all.prefab index 5bbcc7cf..6bf98556 100644 --- a/assets/resources/game/skills/buff_all.prefab +++ b/assets/resources/game/skills/buff_all.prefab @@ -28,16 +28,10 @@ }, { "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 } ], "_prefab": { - "__id__": 12 + "__id__": 8 }, "_lpos": { "__type__": "cc.Vec3", @@ -96,74 +90,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 720, - "height": 100 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -174,7 +100,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 5 }, "_id": "" }, @@ -192,7 +118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 7 }, "_id": "" }, diff --git a/assets/resources/game/skills/buff_do.prefab b/assets/resources/game/skills/buff_do.prefab index 7d8ab9ef..6c4e83e9 100644 --- a/assets/resources/game/skills/buff_do.prefab +++ b/assets/resources/game/skills/buff_do.prefab @@ -32,16 +32,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -233,74 +227,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "cc.Animation", "_name": "", @@ -311,7 +237,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -340,7 +266,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/buff_do2.prefab b/assets/resources/game/skills/buff_do2.prefab index ff7b32ad..7d12fb02 100644 --- a/assets/resources/game/skills/buff_do2.prefab +++ b/assets/resources/game/skills/buff_do2.prefab @@ -32,16 +32,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -233,74 +227,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "cc.Animation", "_name": "", @@ -311,7 +237,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -340,7 +266,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/buffto.prefab b/assets/resources/game/skills/buffto.prefab index 3a2ddd9c..6da2d594 100644 --- a/assets/resources/game/skills/buffto.prefab +++ b/assets/resources/game/skills/buffto.prefab @@ -31,16 +31,10 @@ }, { "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 } ], "_prefab": { - "__id__": 14 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -99,74 +93,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "89ju37xNVPJJOPezJpA7XB" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "07uXEQG8ZCE76IrvSTYrAV" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 10, - "height": 10 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "80LDGzzxtKw7YkqT7LlZHv" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -177,7 +103,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 5 }, "_id": "" }, @@ -195,7 +121,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 7 }, "_id": "" }, @@ -213,7 +139,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 9 }, "_id": "" }, diff --git a/assets/resources/game/skills/bwind.prefab b/assets/resources/game/skills/bwind.prefab index b430502e..3d4dfe2a 100644 --- a/assets/resources/game/skills/bwind.prefab +++ b/assets/resources/game/skills/bwind.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5cF3YtaNJO6arYWX/tn4cL" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bdBL+TclP+79aZSabYtfK" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 60 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 200 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f70rkggRZACZKqkR8MhiBL" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/cuida.prefab b/assets/resources/game/skills/cuida.prefab index b9b63dd6..bb919cb5 100644 --- a/assets/resources/game/skills/cuida.prefab +++ b/assets/resources/game/skills/cuida.prefab @@ -32,16 +32,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -236,74 +230,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 240, - "height": 64.4 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -314,7 +240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -332,7 +258,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/debuff.prefab b/assets/resources/game/skills/debuff.prefab index f04c09bb..a59fe801 100644 --- a/assets/resources/game/skills/debuff.prefab +++ b/assets/resources/game/skills/debuff.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 20, - "height": 80 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/dianquan.prefab b/assets/resources/game/skills/dianquan.prefab index d343f1e8..f8343d1e 100644 --- a/assets/resources/game/skills/dianquan.prefab +++ b/assets/resources/game/skills/dianquan.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 120, - "height": 80 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -356,7 +282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -374,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/fire.prefab b/assets/resources/game/skills/fire.prefab index c67da60f..591b92ee 100644 --- a/assets/resources/game/skills/fire.prefab +++ b/assets/resources/game/skills/fire.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/fireball.prefab b/assets/resources/game/skills/fireball.prefab index 3c46cb23..c6959d24 100644 --- a/assets/resources/game/skills/fireball.prefab +++ b/assets/resources/game/skills/fireball.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/firequan.prefab b/assets/resources/game/skills/firequan.prefab index 16db5481..14c98079 100644 --- a/assets/resources/game/skills/firequan.prefab +++ b/assets/resources/game/skills/firequan.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 120, - "height": 80 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -356,7 +282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -374,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/fireto.prefab b/assets/resources/game/skills/fireto.prefab index 8a45ac49..88cc9d41 100644 --- a/assets/resources/game/skills/fireto.prefab +++ b/assets/resources/game/skills/fireto.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -278,74 +272,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5cF3YtaNJO6arYWX/tn4cL" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bdBL+TclP+79aZSabYtfK" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 40 - }, - "_size": { - "__type__": "cc.Size", - "width": 150, - "height": 200 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f70rkggRZACZKqkR8MhiBL" - }, { "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", "_name": "", @@ -356,7 +282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -374,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/firewall.prefab b/assets/resources/game/skills/firewall.prefab index e5d0cd7b..bbf34366 100644 --- a/assets/resources/game/skills/firewall.prefab +++ b/assets/resources/game/skills/firewall.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -114,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 2.5, - "y": 1.2, + "x": 2.2, + "y": 1.8, "z": 1 }, "_mobility": 0, @@ -278,74 +272,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5cF3YtaNJO6arYWX/tn4cL" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bdBL+TclP+79aZSabYtfK" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 120, - "height": 80 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f70rkggRZACZKqkR8MhiBL" - }, { "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", "_name": "", @@ -356,7 +282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -374,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/fireys.prefab b/assets/resources/game/skills/fireys.prefab index 566a1bce..ff8df94d 100644 --- a/assets/resources/game/skills/fireys.prefab +++ b/assets/resources/game/skills/fireys.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 200, - "height": 64.4 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/flash.prefab b/assets/resources/game/skills/flash.prefab index 516df269..9677ad68 100644 --- a/assets/resources/game/skills/flash.prefab +++ b/assets/resources/game/skills/flash.prefab @@ -32,16 +32,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -233,74 +227,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 399.6, - "height": 80 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -311,7 +237,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -329,7 +255,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/fwind.prefab b/assets/resources/game/skills/fwind.prefab index 858924bc..a0f4696d 100644 --- a/assets/resources/game/skills/fwind.prefab +++ b/assets/resources/game/skills/fwind.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -356,7 +282,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -374,7 +300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/heath.prefab b/assets/resources/game/skills/heath.prefab index 2eb59575..992f99c5 100644 --- a/assets/resources/game/skills/heath.prefab +++ b/assets/resources/game/skills/heath.prefab @@ -41,16 +41,10 @@ }, { "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 27 } ], "_prefab": { - "__id__": 29 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -261,74 +255,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 500 - }, - "_size": { - "__type__": "cc.Size", - "width": 10, - "height": 10 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -339,7 +265,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 16 }, "_id": "" }, @@ -357,7 +283,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 18 }, "playOnLoad": true, "_clips": [ @@ -386,7 +312,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 20 }, "_id": "" }, @@ -404,7 +330,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 22 }, "_id": "" }, @@ -422,7 +348,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 24 }, "_id": "" }, diff --git a/assets/resources/game/skills/heath2.prefab b/assets/resources/game/skills/heath2.prefab index 1be17124..23bfa74f 100644 --- a/assets/resources/game/skills/heath2.prefab +++ b/assets/resources/game/skills/heath2.prefab @@ -38,16 +38,10 @@ }, { "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 26 } ], "_prefab": { - "__id__": 28 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -271,74 +265,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 720, - "height": 60 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -349,7 +275,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 19 }, "playOnLoad": true, "_clips": [ @@ -396,7 +322,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 21 }, "_id": "" }, @@ -414,7 +340,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_id": "" }, diff --git a/assets/resources/game/skills/heath_small.prefab b/assets/resources/game/skills/heath_small.prefab index 4f7d6376..a6bda126 100644 --- a/assets/resources/game/skills/heath_small.prefab +++ b/assets/resources/game/skills/heath_small.prefab @@ -35,16 +35,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -191,74 +185,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0.4, - "y": -0.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 11.6, - "height": 12.3 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -269,7 +195,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 9 }, "_id": "" }, @@ -287,7 +213,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -316,7 +242,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/ice.prefab b/assets/resources/game/skills/ice.prefab index 7ba386ef..ed883933 100644 --- a/assets/resources/game/skills/ice.prefab +++ b/assets/resources/game/skills/ice.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 120, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/icet.prefab b/assets/resources/game/skills/icet.prefab index 6de94cc6..7f446941 100644 --- a/assets/resources/game/skills/icet.prefab +++ b/assets/resources/game/skills/icet.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 120, - "height": 300 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -364,7 +290,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -382,7 +308,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/icez.prefab b/assets/resources/game/skills/icez.prefab index cd25ddc7..7b6c843f 100644 --- a/assets/resources/game/skills/icez.prefab +++ b/assets/resources/game/skills/icez.prefab @@ -35,16 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 27.6 - }, - "_size": { - "__type__": "cc.Size", - "width": 180, - "height": 100 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -335,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -353,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/resources/game/skills/kingba.prefab b/assets/resources/game/skills/kingba.prefab index 9c86a86e..c9290b33 100644 --- a/assets/resources/game/skills/kingba.prefab +++ b/assets/resources/game/skills/kingba.prefab @@ -32,16 +32,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -236,74 +230,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 200, - "height": 200 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -314,7 +240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -332,7 +258,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/mon_ft.prefab b/assets/resources/game/skills/mon_ft.prefab index b6b84b15..3888a160 100644 --- a/assets/resources/game/skills/mon_ft.prefab +++ b/assets/resources/game/skills/mon_ft.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 15, - "height": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/mon_ly.prefab b/assets/resources/game/skills/mon_ly.prefab index ef3d27db..a00b3493 100644 --- a/assets/resources/game/skills/mon_ly.prefab +++ b/assets/resources/game/skills/mon_ly.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 15, - "height": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/mon_sf.prefab b/assets/resources/game/skills/mon_sf.prefab index faacd817..27874c45 100644 --- a/assets/resources/game/skills/mon_sf.prefab +++ b/assets/resources/game/skills/mon_sf.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 15, - "height": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/mon_xd.prefab b/assets/resources/game/skills/mon_xd.prefab index 5f92b4f1..50901ea9 100644 --- a/assets/resources/game/skills/mon_xd.prefab +++ b/assets/resources/game/skills/mon_xd.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,74 +236,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 15, - "height": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "playOnLoad": true, "_clips": [ @@ -367,7 +293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -385,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/patk.prefab b/assets/resources/game/skills/patk.prefab index 7217c2fb..a6b75bac 100644 --- a/assets/resources/game/skills/patk.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -28,16 +28,10 @@ }, { "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 } ], "_prefab": { - "__id__": 12 + "__id__": 8 }, "_lpos": { "__type__": "cc.Vec3", @@ -96,74 +90,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 240, - "height": 100 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -174,7 +100,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 5 }, "_id": "" }, @@ -192,7 +118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 7 }, "_id": "" }, diff --git a/assets/resources/game/skills/shield.prefab b/assets/resources/game/skills/shield.prefab index 09212a16..c97bca2c 100644 --- a/assets/resources/game/skills/shield.prefab +++ b/assets/resources/game/skills/shield.prefab @@ -35,16 +35,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -191,74 +185,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0.4, - "y": -0.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 11.6, - "height": 12.3 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -269,7 +195,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 9 }, "_id": "" }, @@ -287,7 +213,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -316,7 +242,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, diff --git a/assets/resources/game/skills/shoot1.prefab b/assets/resources/game/skills/shoot1.prefab index b559e16e..af68659f 100644 --- a/assets/resources/game/skills/shoot1.prefab +++ b/assets/resources/game/skills/shoot1.prefab @@ -38,16 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -239,74 +233,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 11 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 13 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 100, - "height": 180 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "cc.Animation", "_name": "", @@ -317,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -346,7 +272,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -364,7 +290,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -382,7 +308,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/skills/shoot2.prefab b/assets/resources/game/skills/shoot2.prefab index 37d5d7cb..3e104774 100644 --- a/assets/resources/game/skills/shoot2.prefab +++ b/assets/resources/game/skills/shoot2.prefab @@ -41,16 +41,10 @@ }, { "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 26 } ], "_prefab": { - "__id__": 28 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -378,74 +372,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "63NP9yq3hEUKD/OZZZ5t7x" }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 5, - "height": 5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -456,7 +382,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, @@ -474,7 +400,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 19 }, "playOnLoad": true, "_clips": [ @@ -503,7 +429,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 21 }, "_id": "" }, @@ -521,7 +447,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_id": "" }, diff --git a/assets/script/Main.ts b/assets/script/Main.ts index ad27a32f..00b2da08 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -14,13 +14,6 @@ const { ccclass, property } = _decorator; @ccclass('Main') export class Main extends Root { start() { - // if (DEBUG) profiler.showStats(); - // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb - // // | EPhysics2DDrawFlags.Pair - // |EPhysics2DDrawFlags.CenterOfMass - // |EPhysics2DDrawFlags.Joint - // |EPhysics2DDrawFlags.Shape; - // console.log("PhysicsSystem2D",PhysicsSystem2D.instance.gravity) } protected async run() { smc.initialize = ecs.getEntity(Initialize); diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index c4ea52ea..c8d216dd 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -65,8 +65,8 @@ export const HeroSet = { export const HeroInfo = { 5001:{uuid:5001,name:"神圣守护",path:"k2",quality:3,kind:1,type:0, hp:5120,hp_up:130,shp_up:100,def:100,def_up:16,sdef_up:50,ap:100,ap_up:6, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -74,8 +74,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5002:{uuid:5002,name:"幻影剑豪",path:"k1",quality:3,kind:2,type:0, hp:4650,hp_up:130,shp_up:100,def:100,def_up:16,sdef_up:50,ap:100,ap_up:6, - sap_up:100,atp:1,vun:0,crit:40,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:40,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6024,6024,6024,6024,6024,6024],sk3:[6024,6024,6024,6024,6024,6024],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -83,8 +83,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5003:{uuid:5003,name:"战争领主",path:"k5",quality:3,kind:2,type:0, hp:5230,hp_up:130,shp_up:100,def:100,def_up:16,sdef_up:50,ap:100,ap_up:6, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6027,6027,6027,6027,6027,6027],sk3:[6027,6027,6027,6027,6027,6027],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -164,8 +164,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5201:{uuid:5201,name:"兽人战士",path:"mor1",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -173,8 +173,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5202:{uuid:5202,name:"兽人刺客",path:"mor2",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -191,8 +191,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5204:{uuid:5204,name:"石卫",path:"mgem1",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -200,8 +200,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5205:{uuid:5205,name:"土卫",path:"mgem2",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -209,8 +209,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5206:{uuid:5206,name:"树人",path:"mgem3",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -218,8 +218,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5207:{uuid:5207,name:"小骷髅",path:"mkl1",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -227,8 +227,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5208:{uuid:5208,name:"小骷髅",path:"mkl2",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -236,8 +236,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5209:{uuid:5209,name:"小骷髅",path:"mkl3",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -245,8 +245,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5210:{uuid:5210,name:"骷髅战士",path:"mkl4",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -254,8 +254,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5211:{uuid:5211,name:"骷髅战士",path:"mkl5",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -263,8 +263,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5212:{uuid:5212,name:"骷髅战士",path:"mkl6",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -326,8 +326,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5219:{uuid:5219,name:"牛头战士",path:"mn1",quality:2,kind:1,type:0, hp:5000,hp_up:120,shp_up:100,def:100,def_up:15,sdef_up:50,ap:100,ap_up:5, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -344,8 +344,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5221:{uuid:5221,name:"牛头战士",path:"mn3",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -353,8 +353,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5222:{uuid:5222,name:"独眼巨人",path:"md1",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], @@ -362,8 +362,8 @@ export const HeroInfo = { crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, 5223:{uuid:5223,name:"独眼巨人",path:"md2",quality:1,kind:1,type:0, hp:5000,hp_up:110,shp_up:100,def:100,def_up:14,sdef_up:50,ap:100,ap_up:4, - sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, - a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:580, + a_cd:1,speed:80,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5, doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, sk1:[6008,6008,6008,6008,6008,6008],sk2:[6008,6008,6008,6008,6008,6008],sk3:[6008,6008,6008,6008,6008,6008],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], diff --git a/assets/script/game/common/ecs/position/BattleMoveComp.ts.meta b/assets/script/game/common/ecs/position/BattleMoveComp.ts.meta new file mode 100644 index 00000000..7d680f7e --- /dev/null +++ b/assets/script/game/common/ecs/position/BattleMoveComp.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "196aaacb-556c-4bb2-925c-9a70dc3e56fc", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/common/ecs/position/BattleMoveSystem.ts b/assets/script/game/common/ecs/position/BattleMoveSystem.ts index 3b6c8dec..3bcbfda3 100644 --- a/assets/script/game/common/ecs/position/BattleMoveSystem.ts +++ b/assets/script/game/common/ecs/position/BattleMoveSystem.ts @@ -1,6 +1,7 @@ import { HeroViewComp } from "../../../hero/HeroViewComp"; import { BattleMoveComp } from "./BattleMoveComp"; import { ecs } from "../../../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; +import { smc } from "../../SingletonModuleComp"; @ecs.register('BattleMoveSystem') export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate { @@ -9,24 +10,29 @@ export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemU } update(e: ecs.Entity) { + if(!smc.mission.play||smc.mission.pause) return const move = e.get(BattleMoveComp); const view = e.get(HeroViewComp); if (!move.moving) return; - // 检测攻击范围内是否有敌人 - const hasEnemy = this.checkEnemiesInRange(e, view.dis); - - if (!hasEnemy) { + const shouldStop = this.checkEnemiesInRange(e, view.dis); + view.is_atking = shouldStop; + // 同步攻击状态 + if (!shouldStop) { + if(view.is_stop||view.is_dead) return //停止移动或者死亡不移动 // 计算移动量 const delta = view.speed * this.dt * move.direction; const newX = view.node.position.x + delta; + // 限制移动范围 if (this.validatePosition(newX, move)) { view.node.setPosition(newX, view.node.position.y, 0); } } + + // console.log(`[${view.hero_name}] 类型:${view.type} 是否停止:${shouldStop} 方向:${move.direction} 位置:${view.node.position.x.toFixed(1)}`); } /** 验证目标位置有效性 */ @@ -41,11 +47,23 @@ export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemU private checkEnemiesInRange(entity: ecs.Entity, range: number): boolean { const currentPos = entity.get(HeroViewComp).node.position; const team = entity.get(HeroViewComp).fac; + const view = entity.get(HeroViewComp); + const isMelee = view.type === 0; return ecs.query(ecs.allOf(HeroViewComp)).some(e => { const view = e.get(HeroViewComp); - return view.fac !== team && - Math.abs(currentPos.x - view.node.position.x) <= range; + const distance = Math.abs(currentPos.x - view.node.position.x); + + if (isMelee) { + // 近战需要满足：在攻击范围内且距离<=75才停止 + const inAttackRange = distance <= range; + const closeEnough = distance <= 75; // 近战停止距离 + return view.fac !== team && inAttackRange && closeEnough; + } + else { + // 远程/辅助：在攻击范围内即停止 + return view.fac !== team && distance <= range; + } }); } } \ No newline at end of file diff --git a/assets/script/game/common/ecs/position/BattleMoveSystem.ts.meta b/assets/script/game/common/ecs/position/BattleMoveSystem.ts.meta new file mode 100644 index 00000000..75b87457 --- /dev/null +++ b/assets/script/game/common/ecs/position/BattleMoveSystem.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "9f62614b-42c3-4f21-a3d6-68c9190082e8", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/common/ecs/position/EcsPositionSystem.ts b/assets/script/game/common/ecs/position/EcsPositionSystem.ts index 0720ee8a..7e2c38f7 100644 --- a/assets/script/game/common/ecs/position/EcsPositionSystem.ts +++ b/assets/script/game/common/ecs/position/EcsPositionSystem.ts @@ -5,11 +5,13 @@ * @LastEditTime: 2022-07-25 17:05:02 */ import { ecs } from "../../../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; +import { BattleMoveSystem } from "./BattleMoveSystem"; import { MoveToSystem } from "./MoveTo"; export class EcsPositionSystem extends ecs.System { constructor() { super(); this.add(new MoveToSystem()); + this.add(new BattleMoveSystem()); } } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index a5577978..4f172c03 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -1,4 +1,3 @@ - import { Vec3, _decorator , v3,Collider2D,Contact2DType,Label,RigidBody2D ,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite, math, clamp, Game, tween} from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; @@ -35,7 +34,7 @@ export class HeroViewComp extends CCComp { lv:number =1; slv:number =1; scale: number = 1; /** 角色阵营 1：hero -1 :mon */ - type: number = 0; /**角色类型 0近战 1 远程 2 辅助 */ + type: number = 0; /**角色类型 0近战-需要贴身 1远程-保持距离 2辅助 */ fac:number=0; //阵营 0：hero 1：monster box_group:number = BoxSet.HERO; atk_range:number = 150; @@ -121,9 +120,7 @@ export class HeroViewComp extends CCComp { this.as = this.getComponent(HeroSpine); } /** 视图层逻辑代码分离演示 */ - start () { - this.as.idle() this.BUFFCOMP=this.node.getComponent(BuffComp); /** 方向 */ @@ -133,72 +130,8 @@ export class HeroViewComp extends CCComp { this.node.setScale(this.node.scale.x*1.5,this.node.scale.y*1.5); this.node.getChildByName("top").getChildByName("sboss").active = true; } - /** 显示角色血量 */ + /* 显示角色血量 */ this.node.getChildByName("top").getChildByName("hp").active = true; - - // this.node.getChildByName("shielded").active = false; - // this.node.getChildByName("top").setScale(this.scale,1); - // this.node.getChildByName("atk").setScale(this.scale,1); - // this.node.getChildByName("atk").getComponent(Label).string = this.ap.toString(); - // this.node.getChildByName("hp_max").setScale(this.scale,1); - // this.node.getChildByName("hp_max").getComponent(Label).string=this.hp_max.toString(); - - // 注册单个碰撞体的回调函数 - - let collider = this.getComponent(Collider2D); - collider.group = this.box_group; - // console.log("hero collider ",this.scale,collider); - if (collider) { - collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); - // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this); - collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this); - // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); - } - - - } - onBeginContact (seCol: Collider2D, oCol: Collider2D) { - - if(oCol.tag==BoxSet.SKILL_TAG&&seCol.group != oCol.group){ - let skill = oCol.node.getComponent(SkillCom)!; - // console.log(Date.now()+this.hero_name+":"+this.uuid+' onBeginContact: '+skill.s_name+skill.uuid); - if(this.hp <= 0 ) return - if(skill.tg< 3) return - this.check_uatk(skill); - } - - } - - onEndContact (seCol: Collider2D, oCol: Collider2D) { - - } - onPreSolve (seCol: Collider2D, oCol: Collider2D) { - let se_x = seCol.node.position.x; - let ot_x = oCol.node.position.x; - let oCom= oCol.node.getComponent(HeroViewComp) - if(seCol.group == oCol.group&&seCol.tag==oCol.tag){ - - if(seCol.group==BoxSet.HERO){ - if(oCom.type == this.type&&oCom.yun_cd<=0&&oCom.ice_cd<=0 && se_x < ot_x && Math.abs(ot_x-se_x) < 40 ){ - // this.node.setSiblingIndex(oCol.node.getSiblingIndex()-10) - this.stop_cd = 0.1; - } - } - if(seCol.group==BoxSet.MONSTER){ - if(oCom.type == this.type&&oCom.yun_cd<=0&&oCom.ice_cd<=0 && se_x > ot_x && Math.abs(ot_x-se_x) < 40 ){ - // this.node.setSiblingIndex(oCol.node.getSiblingIndex()-10) - this.stop_cd = 0.1; - } - } - - } - if(seCol.group != oCol.group&&oCol.tag == 0){ - this.stop_cd = 0.1; - this.is_atking=true - } - } - - onPostSolve (seCol: Collider2D, oCol: Collider2D) { } update(dt: number){ if(!smc.mission.play||smc.mission.pause) return @@ -206,14 +139,11 @@ export class HeroViewComp extends CCComp { if(!this.in_grave()) this.to_grave() return } - if (this.pwt.update(dt)) { this.pw+=this.pws } - this.check_power() this.check_atk_counts() - this.check_enemy_alive() this.check_mission_buff() this.hp_show() if(this.ice_cd > 0){ @@ -227,8 +157,8 @@ export class HeroViewComp extends CCComp { this.at += dt; this.in_stop(dt); this.in_atk(dt); - this.move(dt); - } + } + hp_show(){ let hp_progress= this.hp/this.rhp_max; this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; @@ -240,25 +170,6 @@ export class HeroViewComp extends CCComp { } } //移动 - move(dt: number){ - if(this.stop_cd > 0||smc.mission.is_victory||smc.mission.is_defeat){ - this.status_change("idle") - return - } - if (this.node.position.x >= 300 && this.scale==1) { - return; - } - if(this.scale===-1&&this.node.position.x <= -300){ - return; - } - this.status_change("move") - - - // if(this.enemy){ - // return - // } - this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z); - } check_mission_buff(){ this.ap_max=(100+smc.vmdata.mission.ap)/100*this.ap this.crit_max=(100+smc.vmdata.mission.crit)/100*this.crit @@ -273,35 +184,7 @@ export class HeroViewComp extends CCComp { this.rhp_max=(100+smc.vmdata.mission.mhp)/100*this.hp_max } } - check_enemy_alive(){ - // let dir = 720 - // let enemys=smc.enemy_pos - // this.enemy = v3(720,this.node.position.y) - // if(this.box_group == BoxSet.MONSTER){ - // enemys=smc.hero_pos - // // console.log("MONSTER enemys",enemys); - // this.enemy=v3(-720,this.node.position.y) - // } - // for (let i = 0; i < enemys.length; i++) { - // let ho:any = enemys[i]; - // let x=Math.abs(ho.x-this.node.position.x) - // if(x < dir){ - // dir = x - // this.enemy = ho - // } - // } - let dir = Math.abs(smc.mon_front_x-this.node.position.x) - if(this.box_group == BoxSet.MONSTER){ - dir = Math.abs(smc.hero_front_x-this.node.position.x) - } - if(dir < this.dis){ - this.is_atking=true - if(this.dis-dir > 80 &&this.type > 0 ) this.stop_cd = 0.1 - if(dir < 65 &&this.type == 0 ) this.stop_cd = 0.1 - }else{ - this.is_atking=false - } - } + //状态切换 status_change(type:string){ this.status=type @@ -872,19 +755,14 @@ export class HeroViewComp extends CCComp { } //进入墓地 to_grave(){ - let pos =v3(-999,this.node.position.y) - if(this.box_group == BoxSet.MONSTER){ - pos =v3(999,this.node.position.y) - smc.vmdata.mission.mdead +=1 - }else{ - smc.vmdata.mission.dead +=1 - } + let pos =v3(0,-1000,this.node.position.z) this.node.setPosition(pos) } //是否在墓地 in_grave(){ - return this.node.position.x < -900 || this.node.position.x > 900; + return this.node.position.y <= -900; } + to_alive(){ let pos =v3(HeroSet.StartPos[this.type],this.node.position.y,this.node.position.z) this.node.setPosition(pos) diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 81a7f397..d6e3ebdc 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -48,22 +48,8 @@ export class SkillCom extends CCComp { start() { oops.message.on(GameEvent.MissionEnd, this.doDestroy, this); this.node.active=true - let collider = this.getComponent(Collider2D); - collider.group = this.box_group; - collider.tag = this.box_tag; - collider.sensor = true; - if (collider) { - collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); - // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this); - // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); - } } - onBeginContact (seCol: Collider2D, otCol: Collider2D, contact: IPhysics2DContact | null) { - if(otCol.group != seCol.group&&otCol.tag ==0){ - this.atk_count+=1 - } - } to_console(value:any,value2:any=null,value3:any=null){ console.log("["+this.s_name+this.s_uuid+"]:",value,value2,value3) } diff --git a/settings/v2/packages/engine.json b/settings/v2/packages/engine.json index 5331b8e0..a7b473b8 100644 --- a/settings/v2/packages/engine.json +++ b/settings/v2/packages/engine.json @@ -51,7 +51,7 @@ "_value": false }, "physics-2d": { - "_value": true, + "_value": false, "_option": "physics-2d-box2d" }, "physics-2d-box2d": { @@ -134,7 +134,6 @@ "gfx-webgl2", "intersection-2d", "particle-2d", - "physics-2d-box2d", "profiler", "skeletal-animation", "spine",