woso_javan 2 сар өмнө
parent
commit
7898098fb4

+ 6 - 6
assets/module_storm_sunder/Prefabs/PkProp.prefab

@@ -60,7 +60,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -110,7 +110,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -250,7 +250,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -300,7 +300,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -552,7 +552,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -602,7 +602,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,

+ 1 - 1
assets/module_storm_sunder/Script/Component/TornadoAIComponent.ts

@@ -51,7 +51,7 @@ export class TornadoAIComponent extends TornadoComponent {
         const { text, range, move_judge, move_time, escape_time, pursuit_1, pursuit_2, pursuit_time } = aiConfig.data;
         this.playerInfo.nickName = text;
         this.nickName = text;
-        this.currentLv = 11;
+        this.currentLv = 1;
         this.playerInfo.level = this.currentLv;
 
         this.moveDuration = Math.floor(move_time[0] + Math.random() * (move_time[1] - move_time[0] + 1));

+ 4 - 2
assets/module_storm_sunder/Script/Component/TornadoComponent.ts

@@ -70,7 +70,7 @@ export class TornadoComponent extends Component {
         this.attributeBonusMgr = AttributeBonusMgr.inst;
         const userModel = this.attributeBonusMgr.userModel;
 
-        this.currentLv = 1;
+        this.currentLv = 5;
         this.currentExp = 0;
         this.nextExp = this.attributeBonusMgr.getExpNeed(this.currentLv + 1);
         this.attack = this.attributeBonusMgr.getStormSunderAttack(this.currentLv);
@@ -104,11 +104,13 @@ export class TornadoComponent extends Component {
             const targetTornado = otherCollider.node.parent.getComponent(TornadoComponent);
             if (!targetTornado) return;
 
-            console.log(`当前等级:${this.currentLv} 目标等级:${targetTornado.currentLv} isAI:${targetTornado.ai}`);
+            console.log(`击杀者:${event.selfCollider.name} ,受伤者:${event.otherCollider.name}`)
             if (this.currentLv > targetTornado.currentLv) {
                 this.curHitObj = targetTornado.node;
                 this.addExpByKill();
                 this.killed(targetTornado.node);
+
+                Effect2DUIMgr.inst.addPKInfo(this.nickName, targetTornado.nickName);
             }
         }
     }

+ 17 - 0
assets/module_storm_sunder/Script/Manager/Effect2DUIMgr.ts

@@ -8,6 +8,7 @@ import { PlayerInfo, PlayerInfoComponent } from "../Component/PlayerInfoComponen
 import { TornadoComponent } from "../Component/TornadoComponent";
 import { GameUtil } from "../GameUtil";
 import { ExpPropComponent } from "../Component/ExpPropComponent";
+import { PkPropUI } from "../PkPropUI";
 
 export class Effect2DUIMgr {
     private static _instance: Effect2DUIMgr;
@@ -170,6 +171,22 @@ export class Effect2DUIMgr {
         }
     }
 
+    //pk信息
+    async addPKInfo(player1: string, player2: string) {
+        const pkPrefab = await resLoader.loadAsync(
+            resLoader.gameBundleName,
+            "Prefabs/PkProp",
+            Prefab
+        );
+
+        if (pkPrefab) {
+            const pkNode = instantiate(pkPrefab);
+            const effectUI = StormSunderGlobalInstance.instance.effectUI;
+            pkNode.parent = effectUI;
+            pkNode.getComponent(PkPropUI).updateBattleInfo(player1, player2);
+        }
+    }
+
     // 清理血条
     removeBlood(target: Node) {
         const bloodNode = this.bloodMap.get(target);

+ 4 - 1
assets/module_storm_sunder/Script/PkPropUI.ts

@@ -19,8 +19,11 @@ export class PkPropUI extends Component {
     @property(Label)
     lbPlayer1: Label = null;
 
-    updateBattleInfo() {
+    updateBattleInfo(player1: string, player2: string) {
+        this.lbPlayer0.string = player1;
+        this.lbPlayer1.string = player2;
 
+        this.playPkPropAnimation();
     }
 
     //动画 从舞台左入场到中间 停顿0.5s后从中间到舞台右出场

+ 1 - 0
assets/start/Start.ts

@@ -22,6 +22,7 @@ const _preloadRes = [
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Prefabs/PlayerInfo', type: 'prefab' },
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Prefabs/ExpProp', type: 'prefab' },
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Prefabs/LevelUp', type: 'prefab' },
+    { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Prefabs/PkProp', type: 'prefab' },
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Prefabs/Levels/lvl_1', type: 'prefab' },
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Audio/bgm_1.mp3', type: 'audio' },
     { bundle: ModuleDef.MODULE_STORM_SUNDER, url: 'Audio/bgm_2.mp3', type: 'audio' },