素材替换

tower_sanguo/assets/resources/module/fight/prefab_texture/check_point_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "cd3bc3c3-a782-41ac-a4eb-f936549514aa",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "check_point_bg": {
+      "ver": "1.0.4",
+      "uuid": "d20f41e3-8301-4dff-92d6-adda9149537d",
+      "rawTextureUuid": "cd3bc3c3-a782-41ac-a4eb-f936549514aa",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 128,
+      "rawWidth": 750,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -491,11 +491,11 @@ export default class FightUI extends BaseUI {
         //更新主界面的关卡组件
         GameController.mainui.updateMission();
         // cc.tween(this.mission_start).to(0.5, { x: 0 }).delay(0.8).to(0.3, { x: -750 }).call(this.checkGeneralBuff.bind(this)).start();
-        GameUtil.shake(this.lbl_mission.node.parent, 20, 2)// 此处Bug：后面的抖动无效
+        // GameUtil.shake(this.lbl_mission.node.parent, 20, 2)// 此处Bug：后面的抖动无效
         // GameUtil.shake(this.lbl_mission.node.parent.getChildByName('lbl_di'), 20, 2)
         // GameUtil.shake(this.lbl_mission.node.parent.getChildByName('lbl_guan'), 20, 2)
-        this.mission_start.stop();
-        this.mission_start.play();
+        // this.mission_start.stop();
+        // this.mission_start.play();
         XXEvent.emit('event-new-mission-start')// 新的一波开始了
     }
     private playMissionEndEffect(win: boolean, rewards: string) {
@@ -1205,9 +1205,11 @@ export default class FightUI extends BaseUI {
     }
     /** 关闭武将界面时，检查武将羁绊变更，有则展示羁特效 */
     private onCheckFetterChange() {
-        this.clearFetter();
-        this.checkFetterSkill();
-        this.createFetter(true);
+        if (GeneralUIModel.is_change_embattle) {
+            this.clearFetter();
+            this.checkFetterSkill();
+            this.createFetter(true);
+        }
 
     }
 }

tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -184,6 +184,7 @@ export default class MainUI extends BaseUI {
             case PLAYERPROP.FOOD:
                 this.lbl_foodAll.string = value + "";
                 this.task_red.active = TaskModel.checkMainRed();
+                this.showBtnExpUpOrLcBtn();
                 break;
             case PLAYERPROP.REDBAG:
                 this.lbl_redbag.string = value + "";
@@ -395,6 +396,20 @@ export default class MainUI extends BaseUI {
         this.lbl_bar_desc.string = `${fillRange * 100}` + '%'
         this.lbl_time.string = GetLiangCaoModel.need_after_time + 's';
     }
+    /** 检查粮草数量，显示训练按钮 or 粮草按钮 */
+    private showBtnExpUpOrLcBtn() {
+        let cur_food = GameController.gameData.player.getProp(PLAYERPROP.FOOD);
+        let need_food = GameController.gameData.player.getProp(PLAYERPROP.FOODCONSUME)
+        // if (cur_food >= need_food) {
+        //     // 满足下一次训练
+        //     this.btn3.node.active = true;
+        //     this.btn3_1.node.active = false;
+        // } else {
+        //     // 不满足下次训练，显示粮草按钮
+        //     this.btn3.node.active = false;
+        //     this.btn3_1.node.active = true;
+        // }
+    }
     /** 新的一天 
      * - 检测到当前是新的一天，刷新数据
     */