woso_javan 3 veckor sedan
förälder
incheckning
51b0fa86a6

+ 2 - 0
assets/module_aliens/Script/AliensGlobalInstance.ts

@@ -37,6 +37,7 @@ export class AliensGlobalInstance extends Component {
 
         this.btnRender = find('Canvas/GameUI/BattleUI/BottomBtns/BtnRender')!;
         this.btnProbe = find('Canvas/GameUI/BattleUI/BottomBtns/BtnProbe')!;
+        this.btnPowerUp = find('Canvas/GameUI/HomeUI/Power/BtnPowerUp')!;
     }
 
     public camera: Camera = null!; //相机
@@ -55,6 +56,7 @@ export class AliensGlobalInstance extends Component {
 
     public btnRender: Node = null!; //截图按钮
     public btnProbe: Node = null!; //侦擦按钮
+    public btnPowerUp: Node = null!; //体力
 }
 
 

+ 11 - 1
assets/module_aliens/Script/HomeUI.ts

@@ -2,7 +2,7 @@ import { _decorator, Component, Label, Node } from 'cc';
 import { UserManager } from './Manager/UserMgr';
 import { GameUtil } from './GameUtil';
 import { tgxUIMgr } from '../../core_tgx/tgx';
-import { UI_BattleGambit } from '../../scripts/UIDef';
+import { UI_BattleGambit, UI_PowerUp } from '../../scripts/UIDef';
 import { EventDispatcher } from '../../core_tgx/easy_ui_framework/EventDispatcher';
 import { GameEvent } from './Enum/GameEvent';
 import { GlobalConfig } from '../../start/Config/GlobalConfig';
@@ -74,6 +74,9 @@ export class HomeUI extends Component {
 
     private registerListener() {
         EventDispatcher.instance.on(GameEvent.EVENT_REFRESH_PLAYER_INFO,this.updatePowerUI,this);
+
+        const btnPowerUp = this.node.getChildByPath('HomeUI/Power/BtnPowerUp')!;
+        btnPowerUp.on(Node.EventType.TOUCH_END, this.onClickPowerUp,this);
     }
 
     update(deltaTime: number) {
@@ -103,6 +106,13 @@ export class HomeUI extends Component {
         }
     }
 
+    private onClickPowerUp() {
+        const match = tgxUIMgr.inst.isShowing(UI_PowerUp);
+        if (!match) {
+            tgxUIMgr.inst.showUI(UI_PowerUp);
+        } 
+    }
+
     private unregisterListener() {
         EventDispatcher.instance.off(GameEvent.EVENT_REFRESH_PLAYER_INFO,this.updatePowerUI,this); 
     }

+ 2 - 1
assets/module_aliens/Script/Manager/UserMgr.ts

@@ -25,7 +25,8 @@ export class UserManager {
      * @returns 增加后的体力值
      */
     public addPower(value: number): number {
-        this.userModel.powerCurrent = Math.min(this.userModel.powerCurrent + value, this.userModel.powerMax);
+        // this.userModel.powerCurrent = Math.min(this.userModel.powerCurrent + value, this.userModel.powerMax);
+        this.userModel.powerCurrent += value;
         EventDispatcher.instance.emit(GameEvent.EVENT_REFRESH_PLAYER_INFO);
         return this.userModel.powerCurrent;
     }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 194 - 139
assets/module_aliens/rooster_aliens.scene


Vissa filer visades inte eftersom för många filer har ändrats