召唤师技能完成

assets/resources/game/skills/zhaohuan.prefab

@@ -41,10 +41,13 @@
       },
       {
         "__id__": 16
+      },
+      {
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -324,6 +327,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "d9m8Z9r0FAn79RIXwYOlkG"
   },
+  {
+    "__type__": "eb0dfnp0SlNS7Xv5j0GiULm",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1c21gJ3aJD87IqfuwedMbd"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/script/game/common/config/heroSet.ts

@@ -63,11 +63,11 @@ export const HeroSet = {
 
 }
 export const HeroInfo = {
-   5001:{uuid:5001,name:"圣盾骑士",path:"k2",quality:2,kind:1,type:0,
+    5001:{uuid:5001,name:"圣盾战",path:"k2",quality:2,kind:1,type:0,
         hp:5120,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -77,7 +77,7 @@ export const HeroInfo = {
         hp:3120,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6022,6022,6022,6022,6022,6022],sk3:[6022,6022,6022,6022,6022,6022],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -87,17 +87,17 @@ export const HeroInfo = {
         hp:6210,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6004,6004,6004,6004,6004,6004],sk2:[6017,6017,6017,6017,6017,6017],sk3:[6017,6017,6017,6017,6017,6017],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
         uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],
         crc:[1,1,1,1,1,1],tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]},
-   5004:{uuid:5004,name:"复苏骑士",path:"k3",quality:2,kind:1,type:0,
+    5004:{uuid:5004,name:"复苏骑",path:"k3",quality:2,kind:1,type:0,
         hp:5510,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -107,7 +107,7 @@ export const HeroInfo = {
         hp:4720,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6026,6026,6026,6026,6026,6026],sk3:[6026,6026,6026,6026,6026,6026],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -117,7 +117,7 @@ export const HeroInfo = {
         hp:5230,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -127,7 +127,7 @@ export const HeroInfo = {
         hp:3300,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -137,7 +137,7 @@ export const HeroInfo = {
         hp:3160,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6002,6002,6002,6002,6002,6002],sk2:[6012,6012,6012,6012,6012,6012],sk3:[6012,6012,6012,6012,6012,6012],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -147,7 +147,7 @@ export const HeroInfo = {
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -157,17 +157,17 @@ export const HeroInfo = {
         hp:6160,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
-       sk1:[6003,6003,6003,6003,6003,6003],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
+        sk1:[6003,6003,6003,6003,6003,6003],sk2:[6031,6031,6031,6031,6031,6031],sk3:[6031,6031,6031,6031,6031,6031],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
         uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],
         crc:[1,1,1,1,1,1],tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]},
     5011:{uuid:5011,name:"自然德鲁伊",path:"d1",quality:2,kind:2,type:2,
         hp:6220,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -177,7 +177,7 @@ export const HeroInfo = {
         hp:6010,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -187,7 +187,7 @@ export const HeroInfo = {
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6015,6015,6015,6015,6015,6015],sk3:[6015,6015,6015,6015,6015,6015],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -197,7 +197,7 @@ export const HeroInfo = {
         hp:3210,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6016,6016,6016,6016,6016,6016],sk3:[6016,6016,6016,6016,6016,6016],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -207,7 +207,7 @@ export const HeroInfo = {
         hp:3230,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -217,7 +217,7 @@ export const HeroInfo = {
         hp:3090,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:20,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -227,7 +227,7 @@ export const HeroInfo = {
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6017,6013,6013,6013,6013,6013],sk3:[6013,6013,6013,6013,6013,6013],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -237,7 +237,7 @@ export const HeroInfo = {
         hp:4650,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -247,7 +247,7 @@ export const HeroInfo = {
         hp:4650,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -257,7 +257,7 @@ export const HeroInfo = {
         hp:5110,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -267,7 +267,7 @@ export const HeroInfo = {
         hp:5110,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -277,7 +277,7 @@ export const HeroInfo = {
         hp:4550,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -287,7 +287,7 @@ export const HeroInfo = {
         hp:3080,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:20,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6020,6020,6020,6020,6020,6020],sk3:[6020,6020,6020,6020,6020,6020],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -297,7 +297,7 @@ export const HeroInfo = {
         hp:3060,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:20,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6020,6020,6020,6020,6020,6020],sk3:[6020,6020,6020,6020,6020,6020],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -307,7 +307,7 @@ export const HeroInfo = {
         hp:3210,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -317,7 +317,7 @@ export const HeroInfo = {
         hp:3150,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -327,7 +327,7 @@ export const HeroInfo = {
         hp:3130,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:30,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -337,7 +337,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -347,7 +347,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -357,7 +357,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -367,7 +367,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -377,7 +377,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -387,7 +387,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -397,7 +397,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -407,7 +407,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -417,7 +417,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -427,7 +427,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -437,7 +437,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -447,7 +447,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -457,7 +457,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -467,7 +467,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -477,7 +477,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -487,7 +487,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -497,7 +497,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -507,7 +507,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -517,7 +517,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -527,7 +527,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -537,7 +537,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -547,7 +547,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -557,7 +557,7 @@ export const HeroInfo = {
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
         a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
-       doexp:5,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -567,7 +567,7 @@ export const HeroInfo = {
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
         a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -577,7 +577,7 @@ export const HeroInfo = {
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -587,7 +587,7 @@ export const HeroInfo = {
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],
@@ -597,7 +597,7 @@ export const HeroInfo = {
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
         a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
-       doexp:10,dexp:20,pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,
+        doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:0,dpw:0,
         dopw:0,abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,
         uaua:0,uauc:0,cua:0,cuc:0,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:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],

assets/script/game/hero/Hero.ts

@@ -35,7 +35,7 @@ export class Hero extends ecs.Entity {
     }
 
     /** 加载角色 */
-    load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,is_hero:boolean=true) {
+    load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,is_call:boolean=false,lv:number=1) {
         scale = 1
         let box_group=BoxSet.HERO
         this.addComponents<ecs.Comp>( HeroModelComp);
@@ -47,16 +47,18 @@ export class Hero extends ecs.Entity {
         node.parent = scene.entityLayer!.node!
 
         node.setPosition(pos)
-        this.hero_init(uuid,node,scale,box_group)
+        this.hero_init(uuid,node,scale,box_group,is_call,lv)
         oops.message.dispatchEvent("hero_load",this)
     }
     
-    hero_init(uuid:number=1001,node:Node,scale:number=1,box_group=BoxSet.HERO){
+    hero_init(uuid:number=1001,node:Node,scale:number=1,box_group=BoxSet.HERO,is_call:boolean=false,lv:number=1){
         var hv = node.getComponent(HeroViewComp)!;
         // console.log("hero_init",buff)
         let hero= HeroInfo[uuid]  // 共用英雄数据
-        let talent= smc.vmdata.talent //角色英雄数据
         let role =smc.heros[uuid]
+        if(is_call){
+            role={slv:0,lv:lv}
+        }
         let talents=Talents;
         hv.scale = scale;
         hv.box_group = box_group;

assets/script/game/skills/Skill.ts

@@ -22,7 +22,7 @@ export class Skill extends ecs.Entity {
         super.destroy();
     }
     load(pos: Vec3 = Vec3.ZERO,group:number,parent:Node,uuid:number=1001,
-        ap:number =10,t_pos:Vec3 = null,is_crit:boolean=false,crit_add:number=0,hp:number=0)
+        ap:number =10,t_pos:Vec3 = null,is_crit:boolean=false,crit_add:number=0,hp:number=0,lv:number=1)
         {
             var path =  "game/skills/"+SkillSet[uuid].sp_name;
             var prefab: Prefab = oops.res.get(path, Prefab)!;
@@ -49,6 +49,7 @@ export class Skill extends ecs.Entity {
             sv.s_uuid = uuid;
             sv.s_name = SkillSet[uuid].name;            
             sv.hero = SkillSet[uuid].hero;
+            sv.lv=lv
             sv.ap = ap*SkillSet[uuid].ap/100; // 技能伤害
             sv.def = ap*SkillSet[uuid].def/100; // 技能伤害
             sv.apup = ap*SkillSet[uuid].apup/100; // 伤害增量

assets/script/game/skills/SkillCom.ts

@@ -21,6 +21,7 @@ export class SkillCom extends CCComp {
     hero:number = 0;
     speed:number = 200;
     scale:number = 1;
+    lv:number = 1;  
     ap:number = 10;
     def:number = 10;
     apup:number = 0;//

assets/script/game/skills/ZhanCom.ts

@@ -14,73 +14,29 @@ const { ccclass, property } = _decorator;
 export class ZhanCom extends Component {
     base:SkillCom = null
     start() {
+        console.log("ZhanCom:",this.base)
         this.base =this.node.getComponent(SkillCom)
         let pos = this.node.position
         let hero:any=null
+        var path =  "game/skills/dead";
+        var prefab: Prefab = oops.res.get(path, Prefab)!;
+        var node = instantiate(prefab);
+        node.parent = this.node.parent;
+        node.setPosition(pos);
         if(this.base.box_group==BoxSet.HERO) {
             hero = ecs.getEntity<Hero>(Hero);
             let scale = 1
-            hero.load(pos,scale,this.base.hero);
+            hero.load(pos,scale,this.base.hero,true,this.base.lv);
+        }
+        if(this.base.box_group==BoxSet.MONSTER) {
+            hero = ecs.getEntity<Monster>(Monster);
         }
-        if(this.base.box_group==BoxSet.MONSTER) hero = ecs.getEntity<Monster>(Monster);
     }
 
     update(deltaTime: number) {
         
     }
-    call_hero() {
-        let scale = 1
-        let box_group=BoxSet.HERO
-        var path =  "game/heros/"+HeroInfo[this.base.hero].path;
-        var prefab: Prefab = oops.res.get(path, Prefab)!;
-        var node = instantiate(prefab);
-        var scene = smc.map.MapView.scene;
-        node.parent = scene.entityLayer!.node!
-        node.setPosition(this.node.position)
-        oops.message.dispatchEvent("hero_load",this)
-        var hv = node.getComponent(HeroViewComp)!;
-        // console.log("hero_init",buff)
-        let hero= HeroInfo[this.base.hero]  // 共用英雄数据数据
-        hv.scale = scale;
-        hv.box_group = box_group;
-        hv.hero_uuid= this.base.hero;
-        hv.hero_name= hero.name;
-        hv.speed =hv.ospeed = hero.speed;
-        hv.dis = hero.dis;
-        hv.pw = hero.pw;
-        hv.pwm= hero.pwm;
-        hv.pws= hero.pws
-        hv.apw=hero.apw;
-        hv.uapw=hero.uapw;
-        hv.cpw=hero.cpw;
-        hv.dpw=hero.dpw;
-        hv.dopw=hero.dopw; 
-        hv.type = hero.type;
-        let slv = hv.slv = 1;
-        hv.sk1 = hero.sk1[slv]; 
-        hv.sk2 = hero.sk2[slv]; 
-        hv.sk3 = hero.sk3[slv];
-        hv.akc = hero.akc[slv]; 
-        hv.uac = hero.uac[slv];
-        hv.crc = hero.crc[slv];
-        hv.dgc = hero.dgc[slv];
-        hv.akr = hero.akr[slv]; 
-        hv.uar = hero.uar[slv];
-        hv.crr = hero.crr[slv];
-        hv.dgr = hero.dgr[slv];
-        hv.rhp_max=this.base.hp
-        hv.ap = this.base.ap
-        hv.def=this.base.def
-        hv.cd = hero.a_cd
-        hv.crit = hero.crit; //暴击率
-        hv.crit_add = hero.crit_add;//暴击伤害加成
-        hv.dodge = hero.dodge; //闪避率
-        hv.aexp=hero.aexp;
-        hv.uaexp=hero.uaexp;
-        hv.cexp=hero.cexp
-        hv.doexp=hero.doexp
-        hv.dexp=hero.dexp;
-    }
-}
     
 
+
+}