Explorar el Código

主界面阵位解锁并空置时,添加+按钮,可跳转阵位换阵。

薛鸿潇 hace 5 años
padre
commit
a72fe981e6

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1440 - 187
tower_sanguo/assets/resources/module/fight/fight.prefab


BIN
tower_sanguo/assets/resources/module/fight/prefab_texture/add.png


+ 36 - 0
tower_sanguo/assets/resources/module/fight/prefab_texture/add.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "ddae9f4f-0071-4697-a276-9528691a24d2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 47,
+  "height": 47,
+  "platformSettings": {},
+  "subMetas": {
+    "add": {
+      "ver": "1.0.4",
+      "uuid": "8e4d3018-7b10-4b78-b4d8-09b0e55cf2c4",
+      "rawTextureUuid": "ddae9f4f-0071-4697-a276-9528691a24d2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 47,
+      "height": 47,
+      "rawWidth": 47,
+      "rawHeight": 47,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 10 - 0
tower_sanguo/assets/scripts/module/fight/FightNode.ts

@@ -13,14 +13,19 @@ export default class FightNode extends cc.Component {
 	node_lbl: cc.Node;
 	img_suo1: cc.Node;
 	lbl_general1: cc.Node;
+	add_general_1: cc.Node;
 	img_suo2: cc.Node;
 	lbl_general2: cc.Node;
+	add_general_2: cc.Node;
 	img_suo3: cc.Node;
 	lbl_general3: cc.Node;
+	add_general_3: cc.Node;
 	img_suo4: cc.Node;
 	lbl_general4: cc.Node;
+	add_general_4: cc.Node;
 	img_suo5: cc.Node;
 	lbl_general5: cc.Node;
+	add_general_5: cc.Node;
 
     onLoad () {
 		this.fight = this.node;
@@ -34,14 +39,19 @@ export default class FightNode extends cc.Component {
 		this.node_lbl = this.fight.getChildByName("node_lbl");
 		this.img_suo1 = this.node_lbl.getChildByName("img_suo1");
 		this.lbl_general1 = this.node_lbl.getChildByName("lbl_general1");
+		this.add_general_1 = this.node_lbl.getChildByName("add_general_1");
 		this.img_suo2 = this.node_lbl.getChildByName("img_suo2");
 		this.lbl_general2 = this.node_lbl.getChildByName("lbl_general2");
+		this.add_general_2 = this.node_lbl.getChildByName("add_general_2");
 		this.img_suo3 = this.node_lbl.getChildByName("img_suo3");
 		this.lbl_general3 = this.node_lbl.getChildByName("lbl_general3");
+		this.add_general_3 = this.node_lbl.getChildByName("add_general_3");
 		this.img_suo4 = this.node_lbl.getChildByName("img_suo4");
 		this.lbl_general4 = this.node_lbl.getChildByName("lbl_general4");
+		this.add_general_4 = this.node_lbl.getChildByName("add_general_4");
 		this.img_suo5 = this.node_lbl.getChildByName("img_suo5");
 		this.lbl_general5 = this.node_lbl.getChildByName("lbl_general5");
+		this.add_general_5 = this.node_lbl.getChildByName("add_general_5");
 
     }
 }

+ 16 - 3
tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -16,11 +16,13 @@ import AttackFlash from "./model/attack/AttackFlash";
 import AttackWJQF from "./model/attack/AttackWJQF";
 import { POPTYPE } from "../../component/PopMessage";
 import MissionUpdateResponse from "../../net/msg/MissionUpdateResponse";
-import { PLAYERPROP } from "../../data/GameDefinition";
+import { AUDIO_TYPE, PLAYERPROP } from "../../data/GameDefinition";
 import GeneralExpUpResponse from "../../net/msg/GeneralExpUpResponse";
 import AttackWall from "./model/attack/AttackWall";
 import TaskModel from "../task/TaskModel";
 import PiggyBankModel from "../piggyBank/PiggyBankModel";
+import GeneralUI from "../general/GeneralUI";
+import { ViewZorder } from "../../../MOKA/data/ViewZOrder";
 
 const { ccclass, property } = cc._decorator;
 
@@ -100,6 +102,8 @@ export default class FightUI extends BaseUI {
         for (let i = 1; i <= 5; i++) {
             let node_bg: cc.Node = this.ui['general_bg' + i];
             this.generalCroods.push(new cc.Vec2(node_bg.x, node_bg.y));
+            let bnt_add_general = this.ui['add_general_' + i].getComponent(cc.Button);
+            XXEvent.addClickEvent(bnt_add_general, this.onClickGotoZhenWei, this);
         }
 
         this.fightData = GameController.gameData.fightData;
@@ -166,13 +170,17 @@ export default class FightUI extends BaseUI {
      */
     private updateStage(i) {
         let open = GameController.gameData.player.mission_open[i];
-        let lbl: cc.Node = this.ui['lbl_general' + (i + 1)];
+        let index = i + 1;
+        let lbl: cc.Node = this.ui['lbl_general' + index];
         lbl.getComponent(cc.RichText).string = `<outline color=black width=2><color=#F1440B><b>${open}关</c><color=#ffffff><b>解锁</color></outline>`;
 
         let vo = GameController.gameData.player.generals[i];
         lbl.active = !vo && this.current_mission < open;
         this.updateGeneral(i, vo);
-        this.ui['img_suo' + (i + 1)].active = lbl.active;
+        this.ui['img_suo' + index].active = lbl.active;
+        // +号按钮显示逻辑
+        let add_general = this.ui['add_general_' + index];
+        add_general.active = !lbl.active && !vo;
     }
     /**
      * 
@@ -1171,6 +1179,11 @@ export default class FightUI extends BaseUI {
         this.btn_skill.active = GameController.gameData.player.isExistMarshalGeneral();
         XXEvent.emit("MainUIUpdateQiPaoMarshal");
     }
+    /** 点击阵位+号,跳转武将-阵位界面 */
+    private onClickGotoZhenWei() {
+        GameController.audioM.playEffect(AUDIO_TYPE.button);
+        GameController.uiM.openUI(GeneralUI, null, ViewZorder.UI, null, null, { tab_type: 1 });
+    }
 }
 
 /** 技能伤害 */

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio