zane 1 week ago
parent
commit
b65ba07023

+ 3 - 3
assets/resources/prefab/hall/PageShop.prefab

@@ -5190,7 +5190,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "POG CARD",
+    "_string": "POG CRIT",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 26,
@@ -5313,7 +5313,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 57.37890625,
+      "width": 40.6943359375,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -5349,7 +5349,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "X10",
+    "_string": "X1",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_actualFontSize": 30,

+ 13 - 4
assets/resources/prefab/hall/PageShop.ts

@@ -17,7 +17,7 @@ import { FlyContainer, FlyType } from "./FlyContainer";
 import { RewardLayer } from "../layer/RewardLayer";
 import ItemsM from "../../scripts/mgr/ItemsM";
 import EV, { EV_TYPE } from "../../scripts/mgr/EV";
- import { HelpImage, HelpType } from "../layer/HelpImage";
+import { HelpImage, HelpType } from "../layer/HelpImage";
 const { ccclass, property } = _decorator;
 
 @ccclass("PageShop")
@@ -44,14 +44,17 @@ export class PageShop extends BaseUI implements OnTabClickListener {
   static readonly TAB_POG_BOX = { index: 3, name: "ScrollViewPogBox" };
   private _tabsTitle: CommonTabsTitle = null;
   init() {
+
+    this.FindNode("GamePassItem").active = false;
+    this.FindNode("PogBoosterItem").active = false;
+    
     this._tabsTitle = this.getComponentInChildren(CommonTabsTitle);
     let titles = ["GAME PASS", "POG CRIT", "ITEM BOX", "POG BOX"];
     this._tabsTitle.init(titles, this);
 
     // this.onTabClick(PageShop.TAB_GAME_PASS.index);
 
-    this.FindNode("GamePassItem").active = false;
-    this.FindNode("PogBoosterItem").active = false;
+
   }
   onTabClick(index: number) {
     this._tabsTitle.setSelect(index);
@@ -100,7 +103,13 @@ export class PageShop extends BaseUI implements OnTabClickListener {
     grid.removeAllChildren();
 
     let tpl = this.FindNode("PogBoosterItem");
+    tpl.active = false;
     let list = await ShopM.ins.getShopListByStoreId(type);
+    if (!list || list.length <= 0) {
+      Tips.show("Server Shop is empty");
+      return;
+    }
+
     for (let item of list) {
       let itemNode = instantiate(tpl);
       itemNode.active = true;
@@ -186,7 +195,7 @@ export class PageShop extends BaseUI implements OnTabClickListener {
         this.PuzzleToGamePass();
         break;
       case "btn_help_item_box":
-                // Tips.show("ComingSoon");
+        // Tips.show("ComingSoon");
 
         HelpImage.show(HelpType.ItemBox);
         break;

+ 6 - 1
assets/resources/prefab/item/PogBoosterItem.ts

@@ -59,8 +59,10 @@ export class PogBoosterItem extends BaseUI implements IPayListener {
     this._data = item;
     this._configItem = ConfigM.ins.getConfigShopIteByShopId(type, item.id);
 
+    
+
     this.setText("lbl_times", "x" + this._configItem.num);
-    this.setText("lbl_title", this.getName());
+    this.setText("lbl_title", ""+ConfigM.ins.getGoodName(this._configItem.goodId));
 
     this.setIcon();
     this._payItems = this.getComponentInChildren(PayItems);
@@ -90,6 +92,7 @@ export class PogBoosterItem extends BaseUI implements IPayListener {
       );
     }
   }
+   
   setIcon() {
     let icons = this.FindNode("icons");
     icons.children.forEach((child) => {
@@ -109,6 +112,8 @@ export class PogBoosterItem extends BaseUI implements IPayListener {
     }
   }
   getName(): string {
+  
+
     switch (this.type) {
       case PogBoosterItem.TYPE_GAME_PASS:
         return "Game Pass";

+ 9 - 9
assets/resources/prefab/item/RankPlayerItem.prefab

@@ -142,7 +142,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 358.230234375,
+      "width": 329.835234375,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -260,7 +260,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 163.11800000000005,
+      "x": 140.93599999999998,
       "y": 1,
       "z": 0
     },
@@ -396,7 +396,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 201.63199999999995,
+      "x": 178.414,
       "y": 1,
       "z": 0
     },
@@ -437,8 +437,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 13.990234375,
-      "height": 41.8
+      "width": 105.0821953125,
+      "height": 35.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -476,11 +476,11 @@
     "_string": "-",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 30,
-    "_fontSize": 30,
+    "_actualFontSize": 26,
+    "_fontSize": 25,
     "_fontFamily": "Arial",
-    "_lineHeight": 30,
-    "_overflow": 0,
+    "_lineHeight": 25,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,

+ 1 - 1
assets/resources/prefab/item/RankPlayerItem.ts

@@ -22,7 +22,7 @@ export class RankPlayerItem extends BaseUI {
       rank_icons.getChildByName(data.rank + "").active = true;
     }
 
-    this.setText("lbl_rank_value", Utils.formatNumber(data.rankValue, 1));
+    this.setText("lbl_rank_value", Utils.formatNumber(data.rankValue, 5));
     
       if (data.userName != null) {
         this.setText("lbl_user_name", data.userName);