From 7fa1ae119462d8ee5fe6bcc06458344dbda0633f Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Fri, 22 Nov 2024 16:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E6=9C=AC=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/gui/victory.prefab | 10 ++++----- .../script/game/common/SingletonModuleComp.ts | 10 ++++++++- assets/script/game/common/config/Items.ts | 21 ++++++++++++++----- assets/script/game/common/config/heroSet.ts | 8 +++---- assets/script/game/hero/Hero.ts | 18 +++++++--------- assets/script/game/hero/HeroViewComp.ts | 3 --- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/assets/resources/gui/victory.prefab b/assets/resources/gui/victory.prefab index 84146fe2..830adc87 100644 --- a/assets/resources/gui/victory.prefab +++ b/assets/resources/gui/victory.prefab @@ -450,7 +450,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 316.154, + "y": 440.063, "z": 0 }, "_lrot": { @@ -995,7 +995,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 236.021, + "y": 487.592, "z": 0 }, "_lrot": { @@ -1938,7 +1938,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -150, - "y": 223.281, + "y": 231.348, "z": 0 }, "_lrot": { @@ -2401,7 +2401,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 223.281, + "y": 231.348, "z": 0 }, "_lrot": { @@ -2864,7 +2864,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 150, - "y": 223.281, + "y": 231.348, "z": 0 }, "_lrot": { diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 16398b54..cb8f7fd6 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -90,7 +90,15 @@ export class SingletonModuleComp extends ecs.Comp { }, fight_heros:[9001,9001], items:{ - 1001:{uuid: 1001,num:0}, + 1001:0, + 1002:0, + 1003:0, + 1004:0, + 1005:0, + 1006:0, + 1013:0, + 1014:0, + 1015:0, }, heros:{ 9001:{uuid:9001,lv:1,exp:0,slv:1,stone:0}, diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts index 5c4c850d..d0bb9cc8 100644 --- a/assets/script/game/common/config/Items.ts +++ b/assets/script/game/common/config/Items.ts @@ -6,10 +6,21 @@ type: */ export const Items={ - 1001:{uuid: 1001,path: "1001",type: 1,lv: 1,name: "经验卷轴",info:"提升英雄等级", }, - 1002:{uuid: 1002,path: "1002",type: 1,lv: 1,name: "技能卷轴",info:"提升英雄技能等级", }, - 1003:{uuid: 1003,path: "1003",type: 1,lv: 1,name: "治疗药水",info:"战斗中回复英雄血量", }, - 1004:{uuid: 1004,path: "1004",type: 1,lv: 1,name: "攻击药水",info:"战斗中增加英雄攻击", }, - 1005:{uuid: 1005,path: "1005",type: 1,lv: 1,name: "迅捷药水",info:"战斗中增加英雄速度", }, + 1001:{uuid: 1001,path: "1001",type: 1,name: "近战经验卷轴",info:"提升普通近战英雄等级", }, + 1002:{uuid: 1002,path: "1001",type: 1,name: "远程经验卷轴",info:"提升普通远程英雄等级", }, + 1003:{uuid: 1003,path: "1001",type: 1,name: "辅助经验卷轴",info:"提升普通辅助英雄等级", }, + 1004:{uuid: 1004,path: "1001",type: 1,name: "<传说>近战经验卷轴",info:"提升<传说>近战英雄等级", }, + 1005:{uuid: 1005,path: "1001",type: 1,name: "<传说>远程经验卷轴",info:"提升<传说>远程英雄等级", }, + 1006:{uuid: 1006,path: "1001",type: 1,name: "<传说>辅助经验卷轴",info:"提升<传说>辅助英雄等级", }, + 1007:{uuid: 1007,path: "1001",type: 1,name: "近战英雄原石",info:"普通近战英雄升星", }, + 1008:{uuid: 1008,path: "1001",type: 1,name: "远程英雄原石",info:"普通远程英雄升星", }, + 1009:{uuid: 1009,path: "1001",type: 1,name: "辅助英雄原石",info:"普通辅助英雄升星", }, + 1010:{uuid: 1010,path: "1001",type: 1,name: "<传说>近战英雄原石",info:"<传说>近战英雄升星", }, + 1011:{uuid: 1011,path: "1001",type: 1,name: "<传说>远程英雄原石",info:"<传说>远程英雄升星", }, + 1012:{uuid: 1012,path: "1001",type: 1,name: "<传说>辅助英雄原石",info:"<传说>辅助英雄升星", }, + 1013:{uuid: 1013,path: "1001",type: 1,name: "英雄召唤券",info:"普通英雄召唤券，无法召唤传说英雄", }, + 1014:{uuid: 1014,path: "1001",type: 1,name: "<高级>英雄召唤券",info:"<高级>英雄召唤券，召唤传说英雄机率提升", }, + 1015:{uuid: 1015,path: "1001",type: 1,name: "<传说>英雄召唤券",info:"<传说>英雄召唤券，召唤传说英雄机率大幅提升", }, + } diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 342f1cd0..c65f6302 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -1,10 +1,10 @@ export const HeroInfo = { 9001: { - uuid:9001,path:"k1",type:1,lv:1,lv_ep:10,slv:1,slv_ep:10,name: "骑士·白", wp:1001,arm:2001,ring:3001,shoes:4001, - aep:1,uaep:1,dep:10,edep:1, ap: 20, ap_up:2, hp: 200, hp_up:10,def:10,def_up:1,dis: 100, a_cd: 1, - vun:0,crit:20,crit_add:0,dodge:0, sk1: 9001, sk2: 2002, sk3: 9003, sk4: 9004, sk5: 9005, sk6: 9006, pw: 0, pwm: 15,pws: 1, - atktype: 1,akr:[10,20,30,40,50],uar:[10,20,30,40,50],dgr:[10,20,30,40,50],crr:[10,20,30,40,50],akc:[1,1,1,1,1],uac:[1,1,1,1,1],dgc:[1,1,1,1,1],crc:[1,1,1,1,1], speed: 100, + uuid:9001,path:"k1",type:1,lvexp:2,slvexp:2,name: "骑士·白", wp:1001,arm:2001,ring:3001,shoes:4001,speed: 100, + aep:1,uaep:1,dep:10,edep:1, ap: 20, ap_up:2, hp: 200, hp_up:10,def:10,def_up:1,dis: 100, a_cd: 1, atktype: 1, + vun:0,crit:20,crit_add:0,dodge:0, sk1: [9001,9001,9001,9001,9001], sk2: [2002,2002,2002,2002,2002], pw: 0, pwm: 15,pws: 1, + akr:[10,20,30,40,50],uar:[10,20,30,40,50],dgr:[10,20,30,40,50],crr:[10,20,30,40,50],akc:[1,1,1,1,1],uac:[1,1,1,1,1],dgc:[1,1,1,1,1],crc:[1,1,1,1,1], }, diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index e382fa9e..14679efd 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -84,14 +84,11 @@ export class Hero extends ecs.Entity { hv.pw = HInf.pw; hv.pwm= HInf.pwm; hv.pws= HInf.pws - hv.lv = HInf.lv; - hv.slv = HInf.slv; + hv.lv = hero.lv; + hv.slv = hero.slv; hv.type = HInf.type; - hv.sk1 = HInf.sk1; - hv.sk2 = HInf.sk2; - hv.sk3 = HInf.sk3; - hv.sk4 = HInf.sk4; - hv.sk5 = HInf.sk5; + hv.sk1 = HInf.sk1[hero.slv]; + hv.sk2 = HInf.sk2[hero.slv]; hv.akc = HInf.akc[hero.slv]; hv.uac = HInf.uac[hero.slv]; hv.crc = HInf.crc[hero.slv]; @@ -101,11 +98,10 @@ export class Hero extends ecs.Entity { hv.crr = HInf.crr[hero.slv]; hv.dgr = HInf.dgr[hero.slv]; hv.type = HInf.type; - hv.hp= hv.hp_max =HInf.hp; - hv.ap = HInf.ap; - hv.def= HInf.def; + hv.hp= hv.hp_max =HInf.hp+HInf.hp_up*hero.lv ; + hv.ap = HInf.ap+HInf.ap_up*hero.lv ; + hv.def= HInf.def+HInf.def_up*hero.lv; hv.cd = HInf.a_cd - hv.vun = HInf.vun; //易伤 hv.crit = HInf.crit; //暴击率 hv.crit_add = HInf.crit_add;//暴击伤害加成 hv.dodge = HInf.dodge; //闪避率 diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index ef3da795..361708a6 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -64,9 +64,6 @@ export class HeroViewComp extends CCComp { sk1:number = 9001; sk2:number = 1001; - sk3:number = 1001; - sk4:number = 1001; - sk5:number = 1001; akr:number=0; //攻击触发机率 uar:number=0; //受伤触发机率 dgr:number=0; //闪避触发机率