zane 1 ماه پیش
والد
کامیت
eb2d61c67f

+ 4 - 4
assets/resources/anim/spin10.anim

@@ -67,10 +67,10 @@
       0.5
     ],
     "_values": [
-      "10 Times SPIN",
-      "10 Times SPIN.",
-      "10 Times SPIN..",
-      "10 Times SPIN..."
+      "Auto Spin 10 Times",
+      "Auto Spin 10 Times.",
+      "Auto Spin 10 Times..",
+      "Auto Spin 10 Times..."
     ]
   },
   {

+ 2 - 1
assets/resources/i18n/en.ts

@@ -28,7 +28,8 @@ Spend {value}Diamond to upgrade family now?`,
     UpgradeFamilySuccess: "Family upgrade successful! Max member count: +10.",
   },
   Play: {
-    TipsChoose10Times: `Your have more than 10 spins and more than 10 POG Crit, do you want to quick spin 10 times?`,
+    TipsChoose10Times: `You have more than 10 SPINs , do you want to Auto Spin 10 times?
+Note: Auto Spin will auto use your POG Crit Tickets at the same time.`,
   },
   Rank: {
     Season: "SEASON",

+ 1 - 1
assets/resources/prefab/hall/PageWallet.prefab

@@ -6209,7 +6209,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "bg_text_light",
+    "_name": "my_game_pvz",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 451 - 126
assets/resources/prefab/layer/GameDetailLayer.prefab


+ 5 - 1
assets/resources/prefab/layer/GameDetailLayer.ts

@@ -79,6 +79,10 @@ export class GameDetailLayer extends BaseUI implements GameTaskItemCallback {
       this.FindNode("game_pass_pvz_node").active = true;
     }
 
+    if (data.gameUser != null) {
+      this.setText("lbl_link_user_name", data.gameUser.userName);
+    }
+
     let c = ConfigM.ins.getGame(data.gameId);
     this.showButtons(c);
 
@@ -192,7 +196,7 @@ export class GameDetailLayer extends BaseUI implements GameTaskItemCallback {
     this.refreshSpinTimes();
   }
   async spin10times() {
-    let loadingNode = this.FindNode("requesting_10_times")
+    let loadingNode = this.FindNode("requesting_10_times");
     loadingNode.active = true;
     let onceTimes = 10;
 

+ 9 - 0
assets/resources/prefab/wallet/WalletPageMain.ts

@@ -23,6 +23,15 @@ export class WalletPageMain extends BaseUI {
     super.onLoad();
     let self = this;
     self.setTitles();
+    self.initMyGames();
+  }
+  async initMyGames() {
+    let pvzNode = this.FindNode("my_game_pvz");
+    pvzNode.active = false;
+    let isLinkPvz = await UserM.ins.isLinkPvz();
+    if (isLinkPvz) {
+      pvzNode.active = true;
+    }
   }
   setTitles() {
     // this.setText("lbl_my_assets_title", Utils.setI18nLabel("Wallet.MyAssets"));

+ 15 - 1
assets/resources/scripts/api/UserM.ts

@@ -24,7 +24,7 @@ export class GameTaskInfo {
   spinCount: number;
   progress: string;
   onceSpin: number;
-  xp:number
+  xp: number;
 }
 export class GameInfo {
   gameId: number;
@@ -74,6 +74,20 @@ export class MyBadgeInfo {
   badgeList: BadgeInfo[];
 }
 export default class UserM {
+  async isLinkPvz(): Promise<boolean> {
+    let game = this.data?.gameList?.find((item) => item.gameId == 1);
+
+    if (
+      game != null &&
+      game.gameUser != null &&
+      game.gameUser.userId != null &&
+      game.gameUser.userId.length > 0
+    ) {
+      return true;
+    }
+
+    return false;
+  }
   getFamilyId(): string {
     let a = this.data?.familyId;
     if (a == null || a.length == 0) {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است