zh 6 місяців тому
батько
коміт
281c2fda0d
27 змінених файлів з 820 додано та 294 видалено
  1. 6 6
      assets/component/UI_InformationBegin.prefab
  2. 112 112
      assets/res/level5/level5.prefab
  3. 44 44
      assets/res/levels/level1.prefab
  4. 1 1
      assets/resources/effect/zombieDie.prefab
  5. 0 0
      assets/resources/json/Item.json
  6. 0 0
      assets/resources/json/Model.json
  7. 0 0
      assets/resources/json/airdrop_reward.json
  8. 0 0
      assets/resources/json/npc.json
  9. 22 1
      assets/resources/json/searchMarket_reward.json
  10. 3 3
      assets/resources/prefab/Interface/menu.prefab
  11. 2 2
      assets/resources/prefab/Interface/reliveView.prefab
  12. 3 3
      assets/resources/prefab/Interface/signView.prefab
  13. 3 3
      assets/resources/prefab/Interface/story_ani.prefab
  14. 523 98
      assets/resources/prefab/Interface/topMenu.prefab
  15. 1 1
      assets/script/constant/constant-user.ts
  16. 4 1
      assets/script/gameLogic/utrl/gameData.ts
  17. 4 0
      assets/script/ui/uiview/Interface/UIAirdropView.ts
  18. 19 0
      assets/script/ui/uiview/Interface/UICrazyAwardView.ts
  19. 7 1
      assets/script/ui/uiview/Interface/UIMenu.ts
  20. 2 0
      assets/script/ui/uiview/Interface/UIObtainView.ts
  21. 11 9
      assets/script/ui/uiview/Interface/UIReliveView.ts
  22. 2 0
      assets/script/ui/uiview/Interface/UIShopView.ts
  23. 46 6
      assets/script/ui/uiview/Interface/UITopMenu.ts
  24. 2 0
      assets/script/ui/uiview/Interface/UIWelfareView.ts
  25. 1 1
      assets/script/ui/uiview/Interface/UIWinView.ts
  26. 2 2
      assets/script/ui/uiview/common/uiSwitchBtnView.ts
  27. 0 0
      plugins-excel/excel-output/json/client/Item.json

+ 6 - 6
assets/component/UI_InformationBegin.prefab

@@ -40,8 +40,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 228,
-      "height": 130
+      "width": 288,
+      "height": 164
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -156,8 +156,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "靠近道具自动拾取~\n小伙伴会优先拾取更高级别的武器!",
-    "_N$string": "靠近道具自动拾取~\n小伙伴会优先拾取更高级别的武器!",
+    "_string": "Auto-pickup near items. Companions prioritize higher-level weapons.",
+    "_N$string": "Auto-pickup near items. Companions prioritize higher-level weapons.",
     "_fontSize": 18,
     "_lineHeight": 18,
     "_enableWrapText": true,
@@ -180,7 +180,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "56db6a78-a896-493c-aeee-a25d053bf7d6"
     },
     "fileId": "26yrbC83JNE5iGAWT5HsBa",
     "sync": false
@@ -223,7 +223,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "56db6a78-a896-493c-aeee-a25d053bf7d6"
     },
     "fileId": "",
     "sync": false

Різницю між файлами не показано, бо вона завелика
+ 112 - 112
assets/res/level5/level5.prefab


+ 44 - 44
assets/res/levels/level1.prefab

@@ -23397,8 +23397,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 80
+      "width": 230,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -23449,10 +23449,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "小伙伴会优先拾取更高级别的武器!",
-    "_N$string": "小伙伴会优先拾取更高级别的武器!",
-    "_fontSize": 25,
-    "_lineHeight": 25,
+    "_string": "Companions prioritize picking up higher-level weapons!",
+    "_N$string": "Companions prioritize picking up higher-level weapons!",
+    "_fontSize": 23,
+    "_lineHeight": 23,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -23681,7 +23681,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -0.133,
+        3.867,
         17.206,
         0,
         0,
@@ -23721,9 +23721,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": " 靠近道具自动拾取~每人每天消耗10点食物!",
-    "_N$string": " 靠近道具自动拾取~每人每天消耗10点食物!",
-    "_fontSize": 25,
+    "_string": "Auto-pickup near items. Consumes 10 food/day per person",
+    "_N$string": "Auto-pickup near items. Consumes 10 food/day per person",
+    "_fontSize": 23,
     "_lineHeight": 25,
     "_enableWrapText": true,
     "_N$file": null,
@@ -23997,8 +23997,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "靠近僵尸可自动攻击!",
-    "_N$string": "靠近僵尸可自动攻击!",
+    "_string": "Approach zombies to auto-attack!",
+    "_N$string": "Approach zombies to auto-attack!",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,
@@ -24221,8 +24221,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 80
+      "width": 230,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24234,7 +24234,7 @@
       "ctor": "Float64Array",
       "array": [
         4.139,
-        11.538,
+        15.538,
         0,
         0,
         0,
@@ -24273,10 +24273,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "靠近医药包可自动拾取并使用任何小伙伴都可以哦!",
-    "_N$string": "靠近医药包可自动拾取并使用任何小伙伴都可以哦!",
-    "_fontSize": 25,
-    "_lineHeight": 25,
+    "_string": "Approach a med kit to auto-pick up and use it—available for all companions!",
+    "_N$string": "Approach a med kit to auto-pick up and use it—available for all companions!",
+    "_fontSize": 23,
+    "_lineHeight": 23,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -24549,8 +24549,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "夜晚僵尸会变的更强大!夜晚尽量不要外出!",
-    "_N$string": "夜晚僵尸会变的更强大!夜晚尽量不要外出!",
+    "_string": "Zombies become stronger at night! Try not to venture out after dark!",
+    "_N$string": "Zombies become stronger at night! Try not to venture out after dark!",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,
@@ -24563,7 +24563,7 @@
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 0,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -24773,8 +24773,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 80
+      "width": 230,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -24785,7 +24785,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0.56,
+        2.56,
         10.643,
         0,
         0,
@@ -24825,10 +24825,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "拥有远程武器和子弹时,可右键切换使用!",
-    "_N$string": "拥有远程武器和子弹时,可右键切换使用!",
-    "_fontSize": 25,
-    "_lineHeight": 25,
+    "_string": "Right-click to switch to ranged weapons when ammo is available!",
+    "_N$string": "Right-click to switch to ranged weapons when ammo is available!",
+    "_fontSize": 23,
+    "_lineHeight": 23,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -24837,9 +24837,9 @@
     "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
-    "_N$verticalAlign": 0,
+    "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -25049,8 +25049,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 80
+      "width": 230,
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -25101,10 +25101,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "有人需要帮助!靠近自动加入队伍,成为你的小伙伴!",
-    "_N$string": "有人需要帮助!靠近自动加入队伍,成为你的小伙伴!",
-    "_fontSize": 25,
-    "_lineHeight": 25,
+    "_string": "Someone needs help! Auto-join your team upon approach!",
+    "_N$string": "Someone needs help! Auto-join your team upon approach!",
+    "_fontSize": 23,
+    "_lineHeight": 23,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -25377,8 +25377,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "进入室内可以搜集到更多的资源!",
-    "_N$string": "进入室内可以搜集到更多的资源!",
+    "_string": "Enter buildings to gather more resources!",
+    "_N$string": "Enter buildings to gather more resources!",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,
@@ -25653,8 +25653,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "特殊的角色拥有专属的武器或特殊技能",
-    "_N$string": "特殊的角色拥有专属的武器或特殊技能",
+    "_string": "Special characters have exclusive weapons or unique skills.",
+    "_N$string": "Special characters have exclusive weapons or unique skills.",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,
@@ -25667,7 +25667,7 @@
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 0,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 1,
+    "_N$overflow": 2,
     "_N$cacheMode": 0,
     "_id": ""
   },
@@ -25929,8 +25929,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "\n快逃入安全区!",
-    "_N$string": "\n快逃入安全区!",
+    "_string": "Enter the safe zone now!",
+    "_N$string": "Enter the safe zone now!",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,

+ 1 - 1
assets/resources/effect/zombieDie.prefab

@@ -761,7 +761,7 @@
     "asset": {
       "__uuid__": "497eab97-07be-482f-8887-4ce85ddbe27b"
     },
-    "fileId": "833AsN6fNGUajWqqoGC8Q+",
+    "fileId": "",
     "sync": false
   }
 ]

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/resources/json/Item.json


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/resources/json/Model.json


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/resources/json/airdrop_reward.json


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
assets/resources/json/npc.json


+ 22 - 1
assets/resources/json/searchMarket_reward.json

@@ -1 +1,22 @@
-{"1":{"id":1,"itemID":1,"name":"巧克力"},"2":{"id":2,"itemID":2,"name":"薯片"},"3":{"id":3,"itemID":3,"name":"可乐"},"4":{"id":4,"itemID":4,"name":"罐头"}}
+{
+    "1": {
+        "id": 1,
+        "itemID": 1,
+        "name": "cookies"
+    },
+    "2": {
+        "id": 2,
+        "itemID": 2,
+        "name": "chip"
+    },
+    "3": {
+        "id": 3,
+        "itemID": 3,
+        "name": "cola"
+    },
+    "4": {
+        "id": 4,
+        "itemID": 4,
+        "name": "can"
+    }
+}

+ 3 - 3
assets/resources/prefab/Interface/menu.prefab

@@ -498,7 +498,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 266.68,
+      "width": 162.34,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -550,8 +550,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "正在加载中......",
-    "_N$string": "正在加载中......",
+    "_string": "loading...",
+    "_N$string": "loading...",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,

+ 2 - 2
assets/resources/prefab/Interface/reliveView.prefab

@@ -1004,7 +1004,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 22.25,
+      "width": 30.752262456795602,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1065,7 +1065,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 3,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,

+ 3 - 3
assets/resources/prefab/Interface/signView.prefab

@@ -736,7 +736,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 81.36,
+      "width": 88.06,
       "height": 34.239999999999995
     },
     "_anchorPoint": {
@@ -788,8 +788,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "英雄X1",
-    "_N$string": "英雄X1",
+    "_string": "hero X1",
+    "_N$string": "hero X1",
     "_fontSize": 24,
     "_lineHeight": 24,
     "_enableWrapText": true,

+ 3 - 3
assets/resources/prefab/Interface/story_ani.prefab

@@ -184,7 +184,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 71.13,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -236,8 +236,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "跳过",
-    "_N$string": "跳过",
+    "_string": "skip",
+    "_N$string": "skip",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,

Різницю між файлами не показано, бо вона завелика
+ 523 - 98
assets/resources/prefab/Interface/topMenu.prefab


+ 1 - 1
assets/script/constant/constant-user.ts

@@ -37,7 +37,7 @@ class constant_user {
     public static readonly SHOW_CRAZY_IN_LEVEL = 'SHOW_CRAZY_IN_LEVEL';  //首次消耗子弹
 
 
-    public static readonly reLiveNum = 30; //复活次数    zh:diy default = 3    todo:000
+    public static readonly reLiveNum = 5; //复活次数    zh:diy default = 3    todo:000
     public static readonly dayTimes = 90; //白天时间  60s
     public static readonly nightTimes = 50; //黑夜时间  40s
     public static readonly init_powerNum = 100;

+ 4 - 1
assets/script/gameLogic/utrl/gameData.ts

@@ -34,7 +34,7 @@ class GameData {
     set curDay(num: number) {
         this._curDay = num;
         AccountModel.getInstance().curDay = num;
-        zjSdk?.sendEvent('进入第' + num + '天')
+        zjSdk?.sendEvent('Entering Day' + num + '');//进入第X天
         EventManager.emit(EVENT_TYPE.UPDATE_DAY_NUM);
     }
 
@@ -97,6 +97,9 @@ class GameData {
     }
 
 
+
+
+
 }
 export default GameData.instance;
 /**场景数据类 */

+ 4 - 0
assets/script/ui/uiview/Interface/UIAirdropView.ts

@@ -225,6 +225,8 @@ export default class UIAirdropView extends UIBase {
                   console.log('zh:AD not ready  for idx2')
                   self.doGetForAdEventKt();
               }
+            }else{
+                self.doGetForAdEventKt();
             }
           
             return;
@@ -342,6 +344,8 @@ export default class UIAirdropView extends UIBase {
                   console.log('zh:AD not ready  for idx2')
                   self.refreshInfoForAdEventKtsx();
               }
+            }else{
+                self.refreshInfoForAdEventKtsx();
             }
           
             return;

+ 19 - 0
assets/script/ui/uiview/Interface/UICrazyAwardView.ts

@@ -16,6 +16,12 @@ import EventManager from "../../../framework/event/EventManager";
 import tween = cc.tween;
 import AccountModel from "../../../data/Account/AccountModel";
 
+import AESUtil from "../../../AESUtil"
+import ATSDK from "../../../AnyThinkAds/ATJSSDK";
+import ATRewardedVideoSDK from "../../../AnyThinkAds/ATRewardedVideoJSSDK";
+import AAJS2 from "../../../ATAndroidJS2";
+import GlobalManager from '../../../GlobalManager';
+
 const {ccclass, menu, property} = cc._decorator;
 
 @ccclass
@@ -57,6 +63,19 @@ export default class UICrazyAwardView extends UIBase {
         this.ui = this.node.addComponent(auto_crazyAwardView);
         AccountModel.getInstance().show_crazy_in_level ++;
         UIMng.getInstance().setLock(true)
+        this.initAdForPage();
+    }
+
+
+            
+    initAdForPage() {
+        if (cc.sys.os === cc.sys.OS_ANDROID) {
+            let deviceId = AAJS2.getDeviceUserId();
+            console.log("zh:checkstatus:", ATRewardedVideoSDK.checkAdStatus(AAJS2.getPlacementId()));
+            var setting = {};
+            setting[ATRewardedVideoSDK.userIdKey] = deviceId;
+            ATRewardedVideoSDK.loadRewardedVideo(AAJS2.getPlacementId(), setting);
+        }
     }
 
     onShow() {

+ 7 - 1
assets/script/ui/uiview/Interface/UIMenu.ts

@@ -118,6 +118,12 @@ export default class UIMenu extends UIBase implements AdDeveloperCallback {
 				console.log('zh:#############签到奖励 奖励')
 				GlobalManager.getInstance().callMethod('doubleRewardForAdEventQd');
 				break;
+			case 'sendBtnEventForAdEventFuHuo'://复活
+				adKeyTemp = 'sendBtnEventForAdEventFuHuo_monthParams';
+				let mpStr2 = cc.sys.localStorage.getItem(adKeyTemp);
+				console.log('zh:#############复活 奖励',mpStr2)
+				GlobalManager.getInstance().callMethod('sendBtnEventForAdEventFuHuo',mpStr2);
+				break;
 
 			default:
 				console.log('zh:未知的道具类型AD' + idx)
@@ -244,7 +250,7 @@ export default class UIMenu extends UIBase implements AdDeveloperCallback {
 
 
 		if (!this.bloadRes()) {
-			UIHelp.ShowTips('资源加载中......')
+			UIHelp.ShowTips('Loading resources...');//资源加载中......
 			return;
 		}
 		this.bClick = false;

+ 2 - 0
assets/script/ui/uiview/Interface/UIObtainView.ts

@@ -212,6 +212,8 @@ export default class UIObtainView extends UIBase {
                   self.doubleRewardForAdEventQd();
                 
               }
+            }else{
+                self.doubleRewardForAdEventQd();
             }
           
             return;

+ 11 - 9
assets/script/ui/uiview/Interface/UIReliveView.ts

@@ -52,7 +52,7 @@ export default class UIReliveView extends UIBase {
     reLive_btn(event, isRestart) {
         let self = this
         if (!isRestart) {
-            zjSdk?.sendEvent('点击复活按钮')
+            zjSdk?.sendEvent('点击复活按钮isRestart = '+isRestart)
             const params = {
                 payType: zjSdk?.TYPE.VIDEO,
                 success() {
@@ -63,25 +63,26 @@ export default class UIReliveView extends UIBase {
                 }
             };
 
-
-
             if(2>1){//zh:diy
                 if (cc.sys.os === cc.sys.OS_ANDROID) {
-                  GlobalManager.getInstance().registerMethod('doubleRewardForAdEventQd', this.doubleRewardForAdEventQd.bind(this));
+                  GlobalManager.getInstance().registerMethod('sendBtnEventForAdEventFuHuo', this.sendBtnEventForAdEventFuHuo.bind(this));
                   let adKey = "zh_ad_type"
                   
                   if (ATRewardedVideoSDK.hasAdReady(AAJS2.getPlacementId())) {
-                      cc.sys.localStorage.setItem(adKey, 'doubleRewardForAdEventQd');
+                      cc.sys.localStorage.setItem(adKey, 'sendBtnEventForAdEventFuHuo');
+                      cc.sys.localStorage.setItem('sendBtnEventForAdEventFuHuo_monthParams', isRestart);
+
                       console.log('zh:AD  ready for idx2')
                       ATRewardedVideoSDK.showAd(AAJS2.getPlacementId());
       
                   } else {
                       console.log('zh:AD not ready  for idx2')
-                      self.doubleRewardForAdEventQd();
+                      self.sendBtnEventForAdEventFuHuo(isRestart);
                     
                   }
+                }else{
+                    self.sendBtnEventForAdEventFuHuo(isRestart);
                 }
-              
                 return;
             }
 
@@ -97,8 +98,9 @@ export default class UIReliveView extends UIBase {
         this.node.destroy();
     }
 
-    //ZH:TODO  
-    sendBtnEventForAdEvent(isRestart) {
+
+    sendBtnEventForAdEventFuHuo(isRestart) {
+        console.log('zh:sendBtnEventForAdEvent被触发 复活?',isRestart);
         gameEventManager.emit(EVENT_TYPE.GAME_RELIVE, isRestart);
         this.node.destroy();
     }

+ 2 - 0
assets/script/ui/uiview/Interface/UIShopView.ts

@@ -112,6 +112,8 @@ export default class UIShopView extends UIBase {
                   console.log('zh:AD not ready  for idx2')
                   self.doSearchForAdEvent();
               }
+            }else{
+                self.doSearchForAdEvent();
             }
           
             return;

+ 46 - 6
assets/script/ui/uiview/Interface/UITopMenu.ts

@@ -16,6 +16,7 @@ import UIAirdropView from "./UIAirdropView";
 import UISignView from "./UISignView";
 import UIShopView from "./UIShopView";
 import SignUtil from "../../../framework/utils/signUtil";
+
 import show = cc.show;
 
 const { ccclass, menu, property } = cc._decorator;
@@ -38,6 +39,8 @@ export default class UITopMenu extends UIBase {
 	maskNode: cc.Node;
 	redWarn: cc.Node;
 
+	houMenCount:number=0;
+
 	// 食物检查
 	isReducePowerViewed = false;
 	cacheTimeByPower = 0;
@@ -67,7 +70,7 @@ export default class UITopMenu extends UIBase {
 			if (gameData.curBulletNum <= 0) {
 				gameData.cur_attack_mode = ATTACK_MODE.close;
 				gameEventManager.emit(EVENT_TYPE.attack_mode);
-				UIHelp.ShowTips('当前子弹为0,已自动切换成近战模式...');
+				UIHelp.ShowTips('Ammo depleted, switched to melee mode.');//当前子弹为0,已自动切换成近战模式...
 			}
 		}, 0.2)
 		this.isRedLabel();
@@ -110,7 +113,7 @@ export default class UITopMenu extends UIBase {
 		this.ui.power_num.getComponent(cc.Label).string = gameData.curPowerNum.toString();
 		if (gameData.curPowerNum <= 5) {
 			this.redWarn.active = true;
-			UIHelp.ShowTips('体力不足,即将阵亡,请尽快觅食充饥!!!')
+			UIHelp.ShowTips('Low stamina, risk of death! Find food urgently!');//体力不足,即将阵亡,请尽快觅食充饥!!!
 		} else {
 			this.redWarn.active = false;
 		}
@@ -375,11 +378,48 @@ export default class UITopMenu extends UIBase {
     clickWelfare() {
 		zjSdk?.sendEvent('界面曝光-幸存者')
 
-
-		//zh:diy todo:000
-		gameData.curBulletNum =9999;
-
 		gameEventManager.emit(EVENT_TYPE.CHANGE_STATUS,true);
 		UIHelp.ShowUI(UIWelfareView);
     }
+
+
+	
+	//游戏后门
+	clickZhDiyDebug() {
+		let c = this.houMenCount;
+		this.houMenCount =c+1;
+		if(c<3){
+			console.log('zh:后门第'+c+'次');
+			return;
+		}
+	
+		
+		console.log('zh:点击了后门入口');
+
+		//UIHelp.ShowTips('后门入口!');
+      
+		gameData.curBulletNum =9999;//子弹增加
+		gameData.curPowerNum =999;
+		AccountModel.getInstance().reliveNum=99;
+		
+		UIHelp.ShowTips('后门子弹\体力\复活次=99 ');
+
+		// this.curDay = AccountModel.getInstance().curDay; //当前天数
+        // this.curPowerNum = AccountModel.getInstance().curPower; //当前体力
+        // this._curBulletNum = AccountModel.getInstance().curBullet;//当前子弹数
+        // this.curPeopleNum = 0;//当前玩家数
+        // this.peopleDieNum = 0;//玩家死亡数
+        // this.curDiePeopleNum = 0; //当前死亡玩家数
+        // this._curKillZomNum = AccountModel.getInstance().curKillZomNum; //当前已杀死的僵尸数
+        // this.curKillBossNum = 0; //当前杀死的boss数
+        // this.bAddBoss = false;
+
+
+
+
+        // //-----------------------------以下切换副本界面需要用到的数据------------------------------------------------------//
+        // this.playerDtList = [];
+        // //this.isDayTime = true;  //是否是白天
+        // this.curInDungeonType = null; //当前进入的房间类型
+	}
 }

+ 2 - 0
assets/script/ui/uiview/Interface/UIWelfareView.ts

@@ -166,6 +166,8 @@ export default class UIWelfareView extends UIBase {
                   console.log('zh:AD not ready  for idx2')
                   self.doGetForAdEvent(result, type);
               }
+            }else{
+                self.doGetForAdEvent(result, type);
             }
           
             return;

+ 1 - 1
assets/script/ui/uiview/Interface/UIWinView.ts

@@ -101,7 +101,7 @@ export default class UIWinView extends UIBase {
 	nextLevel() {
 		console.log('zh:nextLevel 1');
 		if (AccountModel.getInstance().curLevel >= USER.MAX_LEVEL) {
-			return UIHelp.ShowTips('敬请期待...')
+			return UIHelp.ShowTips('Stay tuned...');//敬请期待...
 		}
 		if (this.bClick) {
 			return;

+ 2 - 2
assets/script/ui/uiview/common/uiSwitchBtnView.ts

@@ -83,7 +83,7 @@ export default class UiSwitchBtnView extends UIBase {
                 return;
             }
             if(gameData.curBulletNum<=0){
-                UIHelp.ShowTips('当前子弹为0,无法切换成远程模式...')
+                UIHelp.ShowTips('Ammo depleted, switched to melee mode.');//当前子弹为0,无法切换成远程模式...
                 return;
             }
             gameData.cur_attack_mode = ATTACK_MODE.remote;
@@ -107,7 +107,7 @@ export default class UiSwitchBtnView extends UIBase {
                 }
             }
         }
-        UIHelp.ShowTips('暂无远程武器...');
+        UIHelp.ShowTips('No ranged weapons...');//暂无远程武器...
         return false;
     }
 

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
plugins-excel/excel-output/json/client/Item.json


Деякі файли не було показано, через те що забагато файлів було змінено