diff --git a/assets/resources/game/skills/dianquan.prefab b/assets/resources/game/skills/dianquan.prefab index f8343d1e..ed1f6fb8 100644 --- a/assets/resources/game/skills/dianquan.prefab +++ b/assets/resources/game/skills/dianquan.prefab @@ -35,13 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9eF2PAF/ZE4oLd18R/CcWz" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bfdVeaCtBMqaDUJo24I5td" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/firequan.prefab b/assets/resources/game/skills/firequan.prefab index 14c98079..aec60db9 100644 --- a/assets/resources/game/skills/firequan.prefab +++ b/assets/resources/game/skills/firequan.prefab @@ -35,13 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9eF2PAF/ZE4oLd18R/CcWz" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bfdVeaCtBMqaDUJo24I5td" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fireto.prefab b/assets/resources/game/skills/fireto.prefab index 88cc9d41..b0f49833 100644 --- a/assets/resources/game/skills/fireto.prefab +++ b/assets/resources/game/skills/fireto.prefab @@ -35,13 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "dfKETtXCZHLrUfWvYgQ2h5" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "42NYkZlwpLzYnt1C/8jzQe" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/firewall.prefab b/assets/resources/game/skills/firewall.prefab index bbf34366..46f0740d 100644 --- a/assets/resources/game/skills/firewall.prefab +++ b/assets/resources/game/skills/firewall.prefab @@ -35,13 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "b0xxzph7dOs7/fPyaSemba" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "22XcJo1ndJmKVyka5mYPkD" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fwind.prefab b/assets/resources/game/skills/fwind.prefab index a0f4696d..f8f3bd92 100644 --- a/assets/resources/game/skills/fwind.prefab +++ b/assets/resources/game/skills/fwind.prefab @@ -35,13 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "35q2dGmmZF2J4J5u44z1jv" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "81zPueUFdLRbv5pMCz4lFW" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/heath.prefab b/assets/resources/game/skills/heath.prefab index 992f99c5..5ac28eda 100644 --- a/assets/resources/game/skills/heath.prefab +++ b/assets/resources/game/skills/heath.prefab @@ -38,13 +38,10 @@ }, { "__id__": 21 - }, - { - "__id__": 23 } ], "_prefab": { - "__id__": 25 + "__id__": 23 }, "_lpos": { "__type__": "cc.Vec3", @@ -302,24 +299,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "684O4uajxIsKmwoOacfpUS" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "aeKuNdU4RH0aHU657oxakt" - }, { "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", "_name": "", @@ -330,7 +309,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 20 }, "_id": "" }, @@ -348,7 +327,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 22 }, "_id": "" }, diff --git a/assets/resources/game/skills/watert.prefab b/assets/resources/game/skills/watert.prefab index 4018b1ee..e342f4cb 100644 --- a/assets/resources/game/skills/watert.prefab +++ b/assets/resources/game/skills/watert.prefab @@ -35,19 +35,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 - }, - { - "__id__": 20 } ], "_prefab": { - "__id__": 22 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -242,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": 200 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, { "__type__": "45646oIyIdA24W+0c5rdELD", "_name": "", @@ -320,7 +243,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "_id": "" }, @@ -338,7 +261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -356,7 +279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, @@ -364,24 +287,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c3g/ZwWHVLApO4IpMsx82J" }, - { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63gZi2R8ZCoonq9o9vdP0W" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/zhaohuan.prefab b/assets/resources/game/skills/zhaohuan.prefab index 0293924a..a1617ab2 100644 --- a/assets/resources/game/skills/zhaohuan.prefab +++ b/assets/resources/game/skills/zhaohuan.prefab @@ -38,16 +38,10 @@ }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -194,74 +188,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": "", @@ -272,7 +198,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 9 }, "_id": "" }, @@ -290,7 +216,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 11 }, "playOnLoad": true, "_clips": [ @@ -319,7 +245,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 13 }, "_id": "" }, @@ -337,7 +263,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 15 }, "_id": "" }, diff --git a/assets/script/game/GameBootstrap.ts.meta b/assets/script/game/GameBootstrap.ts.meta deleted file mode 100644 index d1dbaba0..00000000 --- a/assets/script/game/GameBootstrap.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "8cc0af1b-f8d6-420f-b1c3-9b1f735a843d", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index c8d216dd..de61f26b 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -65,344 +65,268 @@ 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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6018],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:580, + sap_up:100,atp:1,vun:0,crit:40,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6024],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6027],tals:["无","无","无","无","无"]}, 5004:{uuid:5004,name:"混沌法师",path:"zh1",quality:3,kind:2,type:2, hp:6160,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:100,ap_up:6, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6003,6003,6003,6003,6003,6003],sk2:[6031,6031,6031,6031,6031,6031],sk3:[6031,6031,6031,6031,6031,6031],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6003,6031],tals:["无","无","无","无","无"]}, 5005:{uuid:5005,name:"火焰法师",path:"zh2",quality:3,kind:2,type:2, hp:3110,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6003,6003,6003,6003,6003,6003],sk2:[6013,6013,6013,6013,6013,6013],sk3:[6013,6013,6013,6013,6013,6013],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6003,6013],tals:["无","无","无","无","无"]}, 5006:{uuid:5006,name:"风暴精灵",path:"m4",quality:3,kind:2,type:2, hp:3110,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6001,6001,6001,6001,6001,6001],sk2:[6016,6016,6016,6016,6016,6016],sk3:[6016,6016,6016,6016,6016,6016],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6001,6016],tals:["无","无","无","无","无"]}, 5007:{uuid:5007,name:"生命圣者",path:"d1",quality:3,kind:2,type:2, hp:6220,hp_up:150,shp_up:100,def:50,def_up:3,sdef_up:0,ap:100,ap_up:6, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6003,6003,6003,6003,6003,6003],sk2:[6028,6028,6028,6028,6028,6028],sk3:[6028,6028,6028,6028,6028,6028],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6003,6028],tals:["无","无","无","无","无"]}, 5008:{uuid:5008,name:"战争祭祀",path:"d2",quality:3,kind:2,type:2, hp:6010,hp_up:150,shp_up:100,def:50,def_up:3,sdef_up:0,ap:100,ap_up:6, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6003,6003,6003,6003,6003,6003],sk2:[6019,6019,6019,6019,6019,6019],sk3:[6019,6019,6019,6019,6019,6019],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6003,6019],tals:["无","无","无","无","无"]}, 5009:{uuid:5009,name:"暴风射手",path:"a5",quality:3,kind:2,type:1, hp:3080,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6034,6034,6034,6034,6034,6034],sk3:[6034,6034,6034,6034,6034,6034],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6006,6034],tals:["无","无","无","无","无"]}, 5010:{uuid:5010,name:"苍穹射手",path:"a3",quality:3,kind:1,type:1, hp:3230,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6014,6014,6014,6014,6014,6014],sk3:[6014,6014,6014,6014,6014,6014],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6006,6014],tals:["无","无","无","无","无"]}, 5011:{uuid:5011,name:"幽灵射手",path:"a4",quality:3,kind:2,type:1, hp:3090,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:40,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6021,6021,6021,6021,6021,6021],sk3:[6021,6021,6021,6021,6021,6021],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6006,6021],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5203:{uuid:5203,name:"兽人护卫",path:"mor3",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6007,6007,6007,6007,6007,6007],sk2:[6007,6007,6007,6007,6007,6007],sk3:[6007,6007,6007,6007,6007,6007],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6007,6007],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5213:{uuid:5213,name:"骷髅射手",path:"mkla1",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5214:{uuid:5214,name:"骷髅射手",path:"mkla2",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5215:{uuid:5215,name:"骷髅射手",path:"mkla3",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5216:{uuid:5216,name:"元素1",path:"my1",quality:2,kind:1,type:2, hp:3000,hp_up:100,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6001,6001,6001,6001,6001,6001],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6001,6001],tals:["无","无","无","无","无"]}, 5217:{uuid:5217,name:"元素2",path:"my2",quality:2,kind:1,type:2, hp:3000,hp_up:100,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6002,6002,6002,6002,6002,6002],sk2:[6002,6002,6002,6002,6002,6002],sk3:[6002,6002,6002,6002,6002,6002],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6002,6002],tals:["无","无","无","无","无"]}, 5218:{uuid:5218,name:"元素3",path:"my3",quality:2,kind:1,type:2, hp:3000,hp_up:100,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.5,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6003,6003,6003,6003,6003,6003],sk2:[6003,6003,6003,6003,6003,6003],sk3:[6003,6003,6003,6003,6003,6003],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6003,6003],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5220:{uuid:5220,name:"牛头战士",path:"mn2",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6010,6010,6010,6010,6010,6010],sk2:[6010,6010,6010,6010,6010,6010],sk3:[6010,6010,6010,6010,6010,6010],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6010,6010],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],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:580, + sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180, 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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6008,6008],tals:["无","无","无","无","无"]}, 5224:{uuid:5224,name:"独眼巨人",path:"md3",quality:1,kind:1,type:1, hp:3000,hp_up:90,shp_up:100,def:50,def_up:2,sdef_up:0,ap:150,ap_up:9, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400, - a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1.2,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,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], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6005,6005],tals:["无","无","无","无","无"]}, 5225:{uuid:5225,name:"精英独眼",path:"md4",quality:3,kind:1,type:2, hp:6000,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6009,6009,6009,6009,6009,6009],sk2:[6009,6009,6009,6009,6009,6009],sk3:[6009,6009,6009,6009,6009,6009],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6009,6009],tals:["无","无","无","无","无"]}, 5226:{uuid:5226,name:"精英牛头",path:"mn4",quality:3,kind:1,type:2, hp:6000,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6010,6010,6010,6010,6010,6010],sk2:[6010,6010,6010,6010,6010,6010],sk3:[6010,6010,6010,6010,6010,6010],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]}, + skills:[6010,6010],tals:["无","无","无","无","无"]}, 5227:{uuid:5227,name:"精英兽人",path:"mor4",quality:3,kind:1,type:2, hp:6000,hp_up:110,shp_up:100,def:50,def_up:3,sdef_up:0,ap:150,ap_up:12, sap_up:100,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500, - a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, + a_cd:1,speed:40,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10, doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5, dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001, - sk1:[6009,6009,6009,6009,6009,6009],sk2:[6009,6009,6009,6009,6009,6009],sk3:[6009,6009,6009,6009,6009,6009],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1], - uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0], - crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]} + skills:[6009,6009],tals:["无","无","无","无","无"]} }; \ No newline at end of file diff --git a/assets/script/game/hero/BoxRangComp.ts b/assets/script/game/hero/BoxRangComp.ts deleted file mode 100644 index ab58ec56..00000000 --- a/assets/script/game/hero/BoxRangComp.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { _decorator,Contact2DType,Collider2D ,IPhysics2DContact,v3, v2,Vec3} from "cc"; -import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; -import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; -import { BoxSet } from "../common/config/BoxSet"; -import { HeroViewComp } from "./HeroViewComp"; -import { smc } from "../common/SingletonModuleComp"; -const { ccclass, property } = _decorator; - -/** 视图层对象 */ -@ccclass('BoxRangComp') -@ecs.register('BoxRang', false) -export class BoxRangComp extends CCComp { - Hero_node: any=null!; - HeroViewComp:HeroViewComp = null!; - box_group:number = BoxSet.HERO; - box_tag:number = BoxSet.ATK_RANGE; - offset_x:number = 300; - atk_range:number = 150; - /** 视图层逻辑代码分离演示 */ - start() { - let collider = this.getComponent(Collider2D); - collider.group = this.box_group; - collider.tag = this.box_tag; - // collider.offset = v2(300*this.Hero_node.MonView.scale,collider.offset.y); - this.Hero_node = this.node.parent; - this.HeroViewComp=this.Hero_node.getComponent(HeroViewComp); - // console.log("range box",this.HeroViewComp); - 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 (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - - // if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){ - // console.log(this.node.name+"onBeginContact: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); - // this.HeroViewComp.is_atking = true; - // if(Math.abs(otherCollider.node.position.x-selfCollider.node.position.x) < 120){ - // this.HeroViewComp.stop_cd = 0.1 - // } - // } - - } - onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - - if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0 ){ - // console.log(this.node.name+"onEndContact: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); - this.HeroViewComp.is_atking = false; - this.HeroViewComp.enemy = null; - this.HeroViewComp.as.change_default("move"); - this.HeroViewComp.as.move(); - } - } - onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - - if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){ - let scene =smc.map.MapView.scene.mapLayer!.node! - let other_pos = otherCollider.node.getWorldPosition() ; - let self_pos = this.node.getWorldPosition(); - // console.log("onPreSolve:",self_pos,other_pos); - - if(Math.abs(other_pos.x-self_pos.x) < this.HeroViewComp.atk_dis){ - if(this.HeroViewComp.enemy==null){ - this.HeroViewComp.enemy = otherCollider.node; - }else{ - if(this.HeroViewComp.enemy.isValid==false){ - this.HeroViewComp.enemy = otherCollider.node; - - } - } - this.HeroViewComp.is_atking = true; - this.HeroViewComp.stop_cd = 0.1 - } - - } - - } - onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - - - - } - /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ - reset() { - this.node.destroy(); - } -} \ No newline at end of file diff --git a/assets/script/game/hero/BoxRangComp.ts.meta b/assets/script/game/hero/BoxRangComp.ts.meta deleted file mode 100644 index de4b21a0..00000000 --- a/assets/script/game/hero/BoxRangComp.ts.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"4.0.23","importer":"typescript","imported":true,"uuid":"4d46fe9a-6a73-4e21-994b-ae00e9f624d0","files":[],"subMetas":{},"userData":{}} diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 6b4450a3..60d3f680 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -54,6 +54,7 @@ export class Hero extends ecs.Entity { let talents=Talents; hv.scale = scale; hv.fac = 0; + hv.type = hero.type; hv.box_group = box_group; hv.hero_uuid= uuid; hv.hero_name= hero.name; @@ -68,21 +69,7 @@ export class Hero extends ecs.Entity { hv.dpw=hero.dpw; hv.dopw=hero.dopw; hv.lv = role.lv; - hv.type = hero.type; let slv= Math.floor(( hv.lv) / 5); - let sklv=slv - if(sklv >= 5) sklv=5; - hv.sk1 = hero.sk1[sklv]; - hv.sk2 = hero.sk2[sklv]; - hv.sk3 = hero.sk3[sklv]; - hv.akc = hero.akc[sklv]; - hv.uac = hero.uac[sklv]; - hv.crc = hero.crc[sklv]; - hv.dgc = hero.dgc[sklv]; - hv.akr = hero.akr[sklv]; - hv.uar = hero.uar[sklv]; - hv.crr = hero.crr[sklv]; - hv.dgr = hero.dgr[sklv]; hv.rhp_max=hv.hp= hv.hp_max =(hero.hp+hero.hp_up*hv.lv)*(1+hero.shp_up/100*slv) ; hv.ap = (hero.ap+hero.ap_up*hv.lv) *(1+hero.sap_up/100*slv); hv.def= (hero.def+hero.def_up*hv.lv)*(1+hero.sdef_up/100*slv); diff --git a/assets/script/game/hero/HeroSpine_anm.ts b/assets/script/game/hero/HeroSpine_anm.ts deleted file mode 100644 index 52a431ac..00000000 --- a/assets/script/game/hero/HeroSpine_anm.ts +++ /dev/null @@ -1,93 +0,0 @@ -/* - * @Author: dgflash - * @Date: 2022-08-04 15:08:35 - * @LastEditors: dgflash - * @LastEditTime: 2022-08-04 15:26:26 - */ -import { Color, Component, EventTouch, sp, Vec3, _decorator ,Animation, AnimationClip, AnimationState,} from "cc"; -import { LayerUtil } from "../../../../extensions/oops-plugin-framework/assets/core/utils/LayerUtil"; -import { smc } from "../../../script/game/common/SingletonModuleComp"; - -const { ccclass, property } = _decorator; - -/** - * ＲＰＧ ＳＰＩＮＥ角色模型 - */ -@ccclass('HeroSpine') -export class HeroSpine extends Component { - @property(Animation) - animator: Animation = null!; - idle_clip: AnimationClip = null!; - atk_clip: AnimationClip = null!; - move_clip: AnimationClip = null!; - default_clip:string = ""; - - onLoad() { - // 角色控制组件 - this.initAnimator(); - LayerUtil.setNodeLayer(LayerUtil.MAP, this.node); - this.idle_clip = this.animator.clips[0]; - this.atk_clip = this.animator.clips[1]; - this.move_clip = this.animator.clips[2]; - this.default_clip=this.move_clip.name; - let animation = this.animator.getComponent(Animation); - animation.on(Animation.EventType.FINISHED, this.onAnimationEvent, this) - } - protected start(): void { - this.move(); - } - /** 初始化动画 */ - protected initAnimator() { - this.animator=this.node.getChildByName("anm").getComponent(Animation); - - // console.log("mon spine init",this.animator); - } - in_playing(){ - if(this.animator.getState(this.atk_clip.name).isPlaying) return true; - if(this.animator.getState(this.idle_clip.name).isPlaying) return true; - if(this.animator.getState(this.move_clip.name).isPlaying) return true; - return false; - } - onAnimationEvent(type: Animation.EventType, state: AnimationState){ - if(type==Animation.EventType.FINISHED){ - // console.log("animator end",state.name); - if(state.name==this.atk_clip.name){ - this.default(); - } - } - } - change_default(value:string){ - // console.log("change default",value); - this.default_clip=value; - } - default() { - if(!this.in_playing()){ - // console.log("do default"); - this.animator.play(this.default_clip); - } - - } - idle(){ - if(!this.in_playing()){ - console.log("do idle"); - this.animator.play(this.idle_clip.name); - } - } - atk() { - // console.log("do atk"); - this.animator.play(this.atk_clip.name); - } - - - - move(){ - if(!this.animator.getState(this.move_clip.name).isPlaying) { - console.log("doing move"); - this.animator.play(this.move_clip.name); - } - } - onDestroy() { - this.node.destroy(); - } - -} diff --git a/assets/script/game/hero/HeroSpine_anm.ts.meta b/assets/script/game/hero/HeroSpine_anm.ts.meta deleted file mode 100644 index 0c930b8f..00000000 --- a/assets/script/game/hero/HeroSpine_anm.ts.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"4.0.23","importer":"typescript","imported":true,"uuid":"8bf79351-aad1-411f-a117-97ccba1fe15f","files":[],"subMetas":{},"userData":{}} diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 4f172c03..e1d097e7 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -62,9 +62,6 @@ export class HeroViewComp extends CCComp { dpw:number=0; pwt:Timer = new Timer(1); //计时器 - sk1:number = 9001; - sk2:number = 1001; - sk3:number = 1001; akr:number=0; //攻击触发机率 uar:number=0; //受伤触发机率 dgr:number=0; //闪避触发机率 @@ -328,50 +325,50 @@ export class HeroViewComp extends CCComp { * 使用do_skill方法处理触发的技能。 */ check_atk_counts() { - if (this.atk_count >= this.akc) { - this.atk_count = 0 - // console.log("atk_count 清零:"+this.atk_count); - let i = RandomManager.instance.getRandomInt(0,100,3) - // console.log("攻击判断： i="+i+":akr="+this.akr); - if(i < this.akr){ - // console.log("攻击触发： i="+i+":akr="+this.akr); - // this.BUFFCOMP.max_show() - this.do_skill(this.sk3) - } - } - if(this.dodge_count >= this.dgc){ - this.dodge_count = 0 - // console.log("dodge_count 清零:"+this.dodge_count); - let i = RandomManager.instance.getRandomInt(0,100,3) - // console.log("闪避判断： i="+i+":dgr="+this.dgr); - if(i < this.dgr){ - // console.log("闪避触发： i="+i+":dgr="+this.dgr); - // this.BUFFCOMP.max_show() - this.do_skill(this.sk3) - } - } - if(this.crit_count >= this.crc){ - this.crit_count = 0 - // console.log("crit_count 清零:"+this.crit_count); - let i = RandomManager.instance.getRandomInt(0,100,3) - // console.log("暴击判断： i="+i+":crr="+this.crr); - if(i < this.crr){ - // console.log("暴击触发： i="+i+":crr="+this.crr); + // if (this.atk_count >= this.akc) { + // this.atk_count = 0 + // // console.log("atk_count 清零:"+this.atk_count); + // let i = RandomManager.instance.getRandomInt(0,100,3) + // // console.log("攻击判断： i="+i+":akr="+this.akr); + // if(i < this.akr){ + // // console.log("攻击触发： i="+i+":akr="+this.akr); + // // this.BUFFCOMP.max_show() + // this.do_skill(this.sk3) + // } + // } + // if(this.dodge_count >= this.dgc){ + // this.dodge_count = 0 + // // console.log("dodge_count 清零:"+this.dodge_count); + // let i = RandomManager.instance.getRandomInt(0,100,3) + // // console.log("闪避判断： i="+i+":dgr="+this.dgr); + // if(i < this.dgr){ + // // console.log("闪避触发： i="+i+":dgr="+this.dgr); + // // this.BUFFCOMP.max_show() + // this.do_skill(this.sk3) + // } + // } + // if(this.crit_count >= this.crc){ + // this.crit_count = 0 + // // console.log("crit_count 清零:"+this.crit_count); + // let i = RandomManager.instance.getRandomInt(0,100,3) + // // console.log("暴击判断： i="+i+":crr="+this.crr); + // if(i < this.crr){ + // // console.log("暴击触发： i="+i+":crr="+this.crr); - // this.BUFFCOMP.max_show() - this.do_skill(this.sk3) - } - } - if(this.atked_count >= this.uac){ - this.atked_count = 0 - let i = RandomManager.instance.getRandomInt(0,100,3) - // console.log("受伤判断：i="+i+":akr="+this.uar); - if(i < this.uar){ - // console.log("受伤触发： i="+i+":uar="+this.uar); - // this.BUFFCOMP.max_show() - this.do_skill(this.sk3) - } - } + // // this.BUFFCOMP.max_show() + // this.do_skill(this.sk3) + // } + // } + // if(this.atked_count >= this.uac){ + // this.atked_count = 0 + // let i = RandomManager.instance.getRandomInt(0,100,3) + // // console.log("受伤判断：i="+i+":akr="+this.uar); + // if(i < this.uar){ + // // console.log("受伤触发： i="+i+":uar="+this.uar); + // // this.BUFFCOMP.max_show() + // this.do_skill(this.sk3) + // } + // } } in_atk(dt: number) { if(this.at >= this.cd){ @@ -382,9 +379,6 @@ export class HeroViewComp extends CCComp { this.power_add(this.apw) // console.log("cd:"+this.cd); this.as.atk(); - this.scheduleOnce(()=>{ - this.shoot_enemy(this.sk1) - },0.3) } } } @@ -393,7 +387,6 @@ export class HeroViewComp extends CCComp { if(this.pw >= this.pwm){ this.pw = 0 this.BUFFCOMP.max_show() - this.do_skill(this.sk2) return true }else{ return false diff --git a/assets/script/game/hero/Mon.ts b/assets/script/game/hero/Mon.ts index 2317d9ff..d51cbf03 100644 --- a/assets/script/game/hero/Mon.ts +++ b/assets/script/game/hero/Mon.ts @@ -68,6 +68,7 @@ export class Monster extends ecs.Entity { let talents=Talents; hv.scale = scale; hv.fac = 1; + hv.type = hero.type; hv.is_boss = is_boss; hv.box_group = box_group; hv.hero_uuid= uuid; @@ -84,21 +85,6 @@ export class Monster extends ecs.Entity { hv.dopw=hero.dopw; hv.lv = lv; let slv= Math.floor(( hv.lv) / 5); - let sklv=slv - if(sklv >= 5) sklv=5; - - hv.type = hero.type; - hv.sk1 = hero.sk1[sklv]; - hv.sk2 = hero.sk2[sklv]; - hv.sk3 = hero.sk3[sklv]; - hv.akc = hero.akc[sklv]; - hv.uac = hero.uac[sklv]; - hv.crc = hero.crc[sklv]; - hv.dgc = hero.dgc[sklv]; - hv.akr = hero.akr[sklv]; - hv.uar = hero.uar[sklv]; - hv.crr = hero.crr[sklv]; - hv.dgr = hero.dgr[sklv]; hv.rhp_max=hv.hp= hv.hp_max =(hero.hp+hero.hp_up*hv.lv)*(1+hero.shp_up/100*slv); hv.ap = (hero.ap+hero.ap_up*hv.lv) *(1+hero.sap_up/100*slv); hv.def= (hero.def+hero.def_up*hv.lv)*(1+hero.sdef_up/100*slv); diff --git a/assets/script/game/hero/MonModelComp.ts b/assets/script/game/hero/MonModelComp.ts index 087154f6..e53d26d2 100644 --- a/assets/script/game/hero/MonModelComp.ts +++ b/assets/script/game/hero/MonModelComp.ts @@ -12,18 +12,8 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec @ecs.register('MonModel') export class MonModelComp extends ecs.Comp { /** 角色编号 */ - id: number = -1; - - /** 角色名 */ - name: string = "mon"; - /** speed */ - // speed: number = 0; - /** 动画名资源 */ - anim: string = "mon"; + reset() { - this.id = -1; - // this.speed = 0; - this.name = ""; } } diff --git a/assets/script/game/skill/HeroSkillSystem.ts b/assets/script/game/skill/HeroSkillSystem.ts index f9bb33e3..d49bb616 100644 --- a/assets/script/game/skill/HeroSkillSystem.ts +++ b/assets/script/game/skill/HeroSkillSystem.ts @@ -16,7 +16,6 @@ export class HeroSkillSystem extends ecs.ComblockSystem implements e let skills = e.get(HeroSkillsComp); let view = e.get(HeroViewComp); - } diff --git a/assets/script/game/skill/ProjectileComp.ts.meta b/assets/script/game/skill/ProjectileComp.ts.meta deleted file mode 100644 index 3be79b2e..00000000 --- a/assets/script/game/skill/ProjectileComp.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "f563271b-ee28-4cc0-86ec-6947e9fe454e", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/script/game/skill/SkillAnimation.ts.meta b/assets/script/game/skill/SkillAnimation.ts.meta deleted file mode 100644 index daac5ac8..00000000 --- a/assets/script/game/skill/SkillAnimation.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "8c885682-d6d1-4bca-a06b-edb7e1389c08", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/script/game/skills/CdCom.ts b/assets/script/game/skills/CdCom.ts deleted file mode 100644 index 01f8b2ab..00000000 --- a/assets/script/game/skills/CdCom.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { _decorator, Component, Node, RigidBody2D, tween, Vec3 } from 'cc'; -import { SkillCom } from './SkillCom'; -import { HeroViewComp } from '../hero/HeroViewComp'; -import { smc } from '../common/SingletonModuleComp'; -import { HeroModelComp } from '../hero/HeroModelComp'; -import { ecs } from '../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS'; -import { BoxSet } from '../common/config/BoxSet'; -import { MonModelComp } from '../hero/MonModelComp'; -import { SkillSet } from '../common/config/SkillSet'; -const { ccclass, property } = _decorator; - -@ccclass('CdCom') -export class CdCom extends Component { - cd:number = 0; - base:SkillCom = null - time:number = 0; - rigid:RigidBody2D = null - start() { - this.base =this.node.getComponent(SkillCom) - this.rigid = this.getComponent(RigidBody2D); - } - - update(deltaTime: number) { - if(smc.mission.pause) return - this.cd+=deltaTime - if(this.cd>=this.base.cd){ - if(this.base.is_destroy) return - // this.node.setPosition(v3(-1000,0,0)) - this.rigid.sleep() - this.rigid.wakeUp() - if(this.base.tg==2) this.do_all_buff() - this.cd=0 - } - } - do_all_buff(){ - let heros:any = ecs.query(ecs.allOf(HeroModelComp)); - if(this.base.box_group==BoxSet.MONSTER) heros = ecs.query(ecs.allOf(MonModelComp)); - for (let i = 0; i < heros.length; i++) { - let hero:any = heros[i].HeroView; - // if (hero.in_grave) continue - if(SkillSet[this.base.s_uuid].hp > 0){ //buff加血 - // let increase_hp=Math.floor(this.base.hp/(this.base.in_time/this.base.cd)) - let increase_hp=Math.floor(this.base.hp) - hero.add_hp(increase_hp) - } - if(SkillSet[this.base.s_uuid].apup > 0){ //buff加攻击 - // let increase_atk=Math.floor(this.base.apup/(this.base.in_time/this.base.cd)) - let increase_atk=Math.floor(this.base.apup) - hero.add_ap(increase_atk) - } - if(SkillSet[this.base.s_uuid].shield > 0){ //buff护盾 - hero.add_shield(this.base.shield) - } - if(SkillSet[this.base.s_uuid].mhp > 0){ //hp最大值 - hero.add_hp_max(this.base.mhp) - } - } - } -} - - diff --git a/assets/script/game/skills/CdCom.ts.meta b/assets/script/game/skills/CdCom.ts.meta deleted file mode 100644 index 2f721691..00000000 --- a/assets/script/game/skills/CdCom.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "38c6979b-18f3-46b3-9834-c1c9a3347a91", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/script/game/skills/debuff.ts b/assets/script/game/skills/debuff.ts index 3ffc002a..d69ee205 100644 --- a/assets/script/game/skills/debuff.ts +++ b/assets/script/game/skills/debuff.ts @@ -8,7 +8,7 @@ const { ccclass, property } = _decorator; export class debuff extends Component { base: timedCom = null hero:HeroViewComp = null - cd: number = 0 + deff_cd: number = 0 ap: number = 0 start() { this.base =this.node.getComponent(timedCom) @@ -18,15 +18,15 @@ export class debuff extends Component { update(deltaTime: number) { if(smc.mission.pause) return - this.cd += deltaTime - if(this.cd >=1){ + this.deff_cd += deltaTime + if(this.deff_cd >=1){ // this.node.setPosition(v3(-1000,0,0)) if(this.hero){ this.hero.in_atked() this.hero.hp_less(Math.ceil(this.base.ap/this.base.time)) console.log("debuff 总扣血："+this.base.ap+" 每秒： "+Math.ceil(this.base.ap/this.base.time)) } - this.cd=0 + this.deff_cd=0 } } }