diff --git a/assets/resources/game/heros/uiheros/k3.prefab b/assets/resources/game/heros/uiheros/k3.prefab index a59f91b5..9384c4d7 100644 --- a/assets/resources/game/heros/uiheros/k3.prefab +++ b/assets/resources/game/heros/uiheros/k3.prefab @@ -241,8 +241,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.15, - "y": 0.15, + "x": 0.3, + "y": 0.3, "z": 1 }, "_mobility": 0, @@ -269,13 +269,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 695.7100219726562, - "height": 631.8900146484375 + "width": 314.1499938964844, + "height": 336.3500061035156 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.3869859603616717, - "y": 0.04905917055398852 + "x": 0.483590644980259, + "y": 0.03225806506490894 }, "_id": "" }, @@ -306,11 +306,11 @@ "a": 255 }, "_skeletonData": { - "__uuid__": "89c4e995-dd0a-4136-90fa-30a1d2c35409", + "__uuid__": "af4a5925-6b13-46bc-ba05-2419fa3d5cb2", "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "Idle", + "defaultAnimation": "Walking", "_premultipliedAlpha": true, "_timeScale": 0.7, "_preCacheMode": 0, diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index 2de19862..7cadc034 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -50,4 +50,5 @@ export enum GameSet { MON_COIN_ADD=2, COIN_ADD=1, DEF_RATE=0.5, + HERO_NUM=3, } \ No newline at end of file diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index b5b49838..9346bbd7 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -60,7 +60,7 @@ export const HeroInfo = { 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, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, - //坦克,高闪避 , 反伤害 + //坦克,高闪避 ,加闪避 5003: { uuid:5003,name: "防御骑士",path:"k3",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5, lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, diff --git a/assets/script/game/hero/HeroSelectComp.ts b/assets/script/game/hero/HeroSelectComp.ts index b510c3c8..d9f20f7f 100644 --- a/assets/script/game/hero/HeroSelectComp.ts +++ b/assets/script/game/hero/HeroSelectComp.ts @@ -4,6 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { MissionHomeComp } from "../map/MissionHomeComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; +import { GameSet } from "../common/config/BoxSet"; const { ccclass, property } = _decorator; @@ -34,8 +35,8 @@ export class HeroSelectComp extends CCComp { this.mhc_home.cancel_hero(this.h_uuid) return } - if(smc.fight_heros.length>= 5){ - oops.gui.toast("英雄数量不能超过5个") + if(smc.fight_heros.length>= GameSet.HERO_NUM){ + oops.gui.toast(`英雄数量不能超过 ${GameSet.HERO_NUM} 个`); return } smc.fight_heros.push(this.h_uuid) diff --git a/assets/script/game/map/MissionHomeComp.ts b/assets/script/game/map/MissionHomeComp.ts index 07cda3ea..76cefce4 100644 --- a/assets/script/game/map/MissionHomeComp.ts +++ b/assets/script/game/map/MissionHomeComp.ts @@ -4,7 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { HeroInfo, HeroList } from "../common/config/heroSet"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { UiHeroComp } from "../hero/UiHeroComp"; -import { BoxSet } from "../common/config/BoxSet"; +import { BoxSet, GameSet } from "../common/config/BoxSet"; import { smc } from "../common/SingletonModuleComp"; import { HeroSelect } from "../hero/HeroSelect"; import { MSklist, SkillSet } from "../common/config/SkillSet"; @@ -24,8 +24,6 @@ export class MissionHomeComp extends CCComp { heros:any[]=[]; heros_pos:any=[ - {uuid:0,px:100}, - {uuid:0,px:0}, {uuid:0,px:-100}, {uuid:0,px:-200}, {uuid:0,px:-300}, @@ -48,8 +46,6 @@ export class MissionHomeComp extends CCComp { } this.heros=[] this.heros_pos=[ - {uuid:0,px:100}, - {uuid:0,px:0}, {uuid:0,px:-100}, {uuid:0,px:-200}, {uuid:0,px:-300}, @@ -120,7 +116,7 @@ export class MissionHomeComp extends CCComp { }); } select_hero(h_uuid:number){ - for(let i=0;i<=4;i++){ + for(let i=0;i