diff --git a/assets/resources/game/heros/md1.prefab b/assets/resources/game/heros/md1.prefab index 6abdbfa2..6b4f46ee 100644 --- a/assets/resources/game/heros/md1.prefab +++ b/assets/resources/game/heros/md1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.23, - "y": 0.23, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, @@ -471,7 +471,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "", "_premultipliedAlpha": true, "_timeScale": 1, "_preCacheMode": 0, @@ -516,8 +516,6 @@ "__id__": 0 }, "fileId": "4aKyovCOhDJpr23Of35+5a", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/game/heros/md2.prefab b/assets/resources/game/heros/md2.prefab index c9739700..b54d9518 100644 --- a/assets/resources/game/heros/md2.prefab +++ b/assets/resources/game/heros/md2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.23, - "y": 0.23, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/md3.prefab b/assets/resources/game/heros/md3.prefab index f87d84a3..c6b32cbe 100644 --- a/assets/resources/game/heros/md3.prefab +++ b/assets/resources/game/heros/md3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.23, - "y": 0.23, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/md4.prefab b/assets/resources/game/heros/md4.prefab index 7aa27eca..93042f7c 100644 --- a/assets/resources/game/heros/md4.prefab +++ b/assets/resources/game/heros/md4.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.23, - "y": 0.23, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mgem1.prefab b/assets/resources/game/heros/mgem1.prefab index 7f82ddfb..cbb9e354 100644 --- a/assets/resources/game/heros/mgem1.prefab +++ b/assets/resources/game/heros/mgem1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mgem2.prefab b/assets/resources/game/heros/mgem2.prefab index 63a5430e..a2dd9a14 100644 --- a/assets/resources/game/heros/mgem2.prefab +++ b/assets/resources/game/heros/mgem2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mgem3.prefab b/assets/resources/game/heros/mgem3.prefab index 428fd4cd..052a3f8a 100644 --- a/assets/resources/game/heros/mgem3.prefab +++ b/assets/resources/game/heros/mgem3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkl4.prefab b/assets/resources/game/heros/mkl4.prefab index 4d9c6e9f..3b15b28a 100644 --- a/assets/resources/game/heros/mkl4.prefab +++ b/assets/resources/game/heros/mkl4.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.25, + "y": 0.25, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkl5.prefab b/assets/resources/game/heros/mkl5.prefab index abff7fe4..8c3ced0e 100644 --- a/assets/resources/game/heros/mkl5.prefab +++ b/assets/resources/game/heros/mkl5.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.32, - "y": 0.32, + "x": 0.21, + "y": 0.21, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkl6.prefab b/assets/resources/game/heros/mkl6.prefab index a168077d..5ad29776 100644 --- a/assets/resources/game/heros/mkl6.prefab +++ b/assets/resources/game/heros/mkl6.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.21, + "y": 0.21, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkla1.prefab b/assets/resources/game/heros/mkla1.prefab index e6a74036..2ddaa8f2 100644 --- a/assets/resources/game/heros/mkla1.prefab +++ b/assets/resources/game/heros/mkla1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.23, + "y": 0.23, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkla2.prefab b/assets/resources/game/heros/mkla2.prefab index 1d5e2356..07e1f8a8 100644 --- a/assets/resources/game/heros/mkla2.prefab +++ b/assets/resources/game/heros/mkla2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.23, + "y": 0.23, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mkla3.prefab b/assets/resources/game/heros/mkla3.prefab index 1376c8be..dd96a29f 100644 --- a/assets/resources/game/heros/mkla3.prefab +++ b/assets/resources/game/heros/mkla3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.32, - "y": 0.32, + "x": 0.23, + "y": 0.23, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mn1.prefab b/assets/resources/game/heros/mn1.prefab index 0516ff80..f7423883 100644 --- a/assets/resources/game/heros/mn1.prefab +++ b/assets/resources/game/heros/mn1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mn2.prefab b/assets/resources/game/heros/mn2.prefab index 928213b2..2f4a504e 100644 --- a/assets/resources/game/heros/mn2.prefab +++ b/assets/resources/game/heros/mn2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mn3.prefab b/assets/resources/game/heros/mn3.prefab index 4ac15712..1da748a0 100644 --- a/assets/resources/game/heros/mn3.prefab +++ b/assets/resources/game/heros/mn3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mn4.prefab b/assets/resources/game/heros/mn4.prefab index 801e995a..309743d7 100644 --- a/assets/resources/game/heros/mn4.prefab +++ b/assets/resources/game/heros/mn4.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab index f02a46bf..8772e1af 100644 --- a/assets/resources/game/heros/mor1.prefab +++ b/assets/resources/game/heros/mor1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab index ad8d3cdd..14764f2c 100644 --- a/assets/resources/game/heros/mor2.prefab +++ b/assets/resources/game/heros/mor2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab index c7ad8689..4fcd0963 100644 --- a/assets/resources/game/heros/mor3.prefab +++ b/assets/resources/game/heros/mor3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/mor4.prefab b/assets/resources/game/heros/mor4.prefab index 75d1c118..b20e2886 100644 --- a/assets/resources/game/heros/mor4.prefab +++ b/assets/resources/game/heros/mor4.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/my1.prefab b/assets/resources/game/heros/my1.prefab index f982e01c..3cebb959 100644 --- a/assets/resources/game/heros/my1.prefab +++ b/assets/resources/game/heros/my1.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/my2.prefab b/assets/resources/game/heros/my2.prefab index a8a10efa..b46e8976 100644 --- a/assets/resources/game/heros/my2.prefab +++ b/assets/resources/game/heros/my2.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/my3.prefab b/assets/resources/game/heros/my3.prefab index 51c41acc..ebc791da 100644 --- a/assets/resources/game/heros/my3.prefab +++ b/assets/resources/game/heros/my3.prefab @@ -402,8 +402,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.18, + "y": 0.18, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/heros/top.prefab b/assets/resources/game/heros/top.prefab index 8933b2a0..a8ca9495 100644 --- a/assets/resources/game/heros/top.prefab +++ b/assets/resources/game/heros/top.prefab @@ -109,7 +109,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -35, + "y": -15, "z": 0 }, "_lrot": { @@ -121,7 +121,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, + "x": 1, "y": 1, "z": 1 }, @@ -202,7 +202,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 350, + "width": 300, "height": 50 }, "_anchorPoint": { @@ -336,7 +336,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -34.2, + "x": -30, "y": 0, "z": 0 }, @@ -377,8 +377,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 68.4, - "height": 8.4 + "width": 60, + "height": 10 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -408,9 +408,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 11, - "g": 238, - "b": 20, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { @@ -450,10 +450,10 @@ }, "_alignFlags": 45, "_target": null, - "_left": 0.8, - "_right": 0.8, - "_top": 0.8, - "_bottom": 0.8, + "_left": 0, + "_right": -3.552713678800501e-15, + "_top": 0, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -499,7 +499,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 70, + "width": 60, "height": 10 }, "_anchorPoint": { diff --git a/assets/script/game/common/ecs/position/BattleMoveSystem.ts b/assets/script/game/common/ecs/position/BattleMoveSystem.ts index 4e273aaa..97c96a2a 100644 --- a/assets/script/game/common/ecs/position/BattleMoveSystem.ts +++ b/assets/script/game/common/ecs/position/BattleMoveSystem.ts @@ -20,7 +20,6 @@ export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemU const shouldStop = this.checkEnemiesInFace(e); view.is_atking = this.checkEnemiesInRange(e, view.dis); - console.log("shouldStop",shouldStop,"view.is_atking",view.is_atking) // 更新渲染层级 this.updateRenderOrder(e); diff --git a/assets/script/game/hero/BuffComp.ts b/assets/script/game/hero/BuffComp.ts index bb049b11..99e63184 100644 --- a/assets/script/game/hero/BuffComp.ts +++ b/assets/script/game/hero/BuffComp.ts @@ -39,12 +39,10 @@ export class BuffComp extends Component { info_init(){ this.top_node = this.node.getChildByName("top"); - this.top_node.getChildByName("lv").active=(this.node.getComponent(HeroViewComp).fac == 0 ? true : false) + this.top_node.getChildByName("lv").active=false // this.top_node.getChildByName("hp").active=(this.node.getComponent(HeroViewComp).fac == 1 ? true : false) this.top_node.getChildByName("sboss").active=this.node.getComponent(HeroViewComp).is_boss - if(this.node.getComponent(HeroViewComp).hero_uuid == 9999){ - this.top_node.getChildByName("lv").active=false - } + this.top_node.getChildByName("lv").getChildByName("lv").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).lv.toFixed(0) this.top_node.getChildByName("ihp").getChildByName("num").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).hp.toFixed(0) this.top_node.getChildByName("iap").getChildByName("num").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).ap.toFixed(0)