fix

assets/Scripts/Sub/MainScene.ts

@@ -4,22 +4,23 @@ import GameRootUI from "../Main/Common/GameRootUI";
 const { ccclass, property } = _decorator;
 
 //主界面场景
-@ccclass("MainScene")
+@ccclass('MainScene')
 export class MainScene extends Component {
-  @property(Node)
-  UIRoot: Node = null;
-  @property(Node)
-  UILayerMod: Node = null;
-  @property(Camera)
-  MainCamera: Camera = null;
 
-  start() {
+    @property(Node)
-    //每个场景必须添加的
+    UIRoot: Node = null
-    let gameRootUI = this.node.getComponent(GameRootUI);
+    @property(Node)
-    if (!gameRootUI) {
+    UILayerMod: Node = null
-      gameRootUI = this.node.addComponent(GameRootUI);
+    @property(Camera)
-      gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "MainPanel");
+    MainCamera: Camera = null
+
+    start() {
+        //每个场景必须添加的
+        let gameRootUI = this.node.getComponent(GameRootUI)
+        if (!gameRootUI){
+            gameRootUI = this.node.addComponent(GameRootUI)
+            gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "ThemePanel");
+        }
+        GameRootUI.MainCamera = this.MainCamera
     }
-    GameRootUI.MainCamera = this.MainCamera;
+}
-  }
-}

assets/Scripts/chat18x/ui/panels/MainPanel.ts

@@ -1,228 +0,0 @@
-import {
-  _decorator,
-  Component,
-  Node,
-  instantiate,
-  Label,
-  Sprite,
-  UITransform,
-} from "cc";
-import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
-import Utils from "db://assets/Scripts/Main/Common/Utils";
-import { GButton } from "db://assets/Scripts/Main/Common/GButton";
-import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
-import { ThemeItem } from "../../uiitems/ThemeItem";
-import { NavigationManager } from "../../manager/NavigationManager";
-import { GirlListItem } from "../../uiitems/GirlListItem";
-import LanguageUtils from "../../../Main/Common/LanguageUtils";
-import { ViewManager } from "../../../Main/Manager/ViewManager";
-import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode";
-import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService";
-import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
-import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService";
-import { DataManager, DataId } from "../../data/DataManager";
-import { ThemeData } from "../../data/ThemeData";
-import { GirlData } from "../../data/GirlData";
-import { WalletData } from "../../data/WalletData";
-import { AccountData } from "../../data/AccountData";
-
-import { ShopData } from "../../data/ShopData";
-import proto from "db://assets/Scripts/proto/proto.pb.js";
-import GameRootUI from "../../../Main/Common/GameRootUI";
-
-const { ccclass, property } = _decorator;
-
-@ccclass("MainPanel")
-export class MainPanel extends li_BaseView {
-  private _nodeTab: any = {};
-
-  coinNum: Label;
-  uid: Label;
-  itemInst: GirlListItem;
-  content: Node;
-  private vipLeftTime: Label;
-  recId: number;
-  recName: Label;
-  recSprite: Sprite;
-
-  cache: ThemeItem[] = [];
-
-  onLoadCT() {
-    Utils.parseNode(this.node, this._nodeTab);
-
-    this.coinNum = this._nodeTab.coinNum.getComponent(Label);
-    this.uid = this._nodeTab.uid.getComponent(Label);
-    this.recName = this._nodeTab.characterNameText.getComponent(Label);
-    this.recSprite = this._nodeTab.recPicSlot.getComponent(Sprite);
-    this.vipLeftTime = this._nodeTab.vipText.getComponent(Label);
-
-    this.registerListener();
-    this.itemInst = this._nodeTab.ThemeItem.getComponent(ThemeItem);
-    this.itemInst.node.active = false;
-    this.content = this._nodeTab.allThemecontent;
-
-    this.Show();
-  }
-
-  rectNameKey: string;
-  async Show() {
-    //some temp data
-    this.refreshCoinNum();
-    this.refreshVipExpire();
-    const accountData = DataManager.I.getDataById<AccountData>(DataId.Account);
-    this.uid.string = "uid: " + accountData.accId;
-    this.recId = 1;
-    if (this.cache) {
-      for (let i = this.cache.length - 1; i >= 0; i--) {
-        this.cache[i].node.destroy();
-      }
-    }
-    this._nodeTab.loadingRec.active = true;
-    // 请求主题数据
-    const reqData = {};
-    let res = await ThemeService.I.reqHallTheme(reqData);
-    if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
-      // 保存数据
-      const themeData = DataManager.I.getDataById<ThemeData>(DataId.Theme);
-      themeData.themes = res.data;
-      // 根据数据，刷新界面
-      const themeIds = themeData.themeIds;
-      for (let id of themeIds) {
-        let newNode = instantiate(this.itemInst.node);
-        let item = newNode.getComponent(ThemeItem);
-        item.refresh(id);
-        newNode.active = true;
-        this.cache.push(item);
-        this.content.addChild(newNode);
-      }
-    }
-
-    // 请求每日推荐
-    const reqData2 = {};
-    let res2 = await GirlService.I.reqDailyRecommend(reqData2);
-    if (res2 && res2.code === proto.cs.EnmRetCode.SUCCESS) {
-      const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-      girlData.setDailyRecommend(res2.data);
-      // 根据数据，刷新界面
-      this.recId = girlData.getRecommendGirlId();
-      this.rectNameKey = girlData.getRecommendGrilName();
-      let avatarPath = girlData.getRecommendGrilAvatar();
-      this.recName.string = LanguageUtils.getText(this.rectNameKey);
-      ResManager.I.changeBundleSpriteFrame(
-        this.recSprite,
-        avatarPath,
-        "Girls",
-        () => {
-          let sizeTran = this.recSprite.node.parent.getComponent(UITransform);
-          Utils.adjustBgPixelRatioToSize(
-            sizeTran.contentSize,
-            this.recSprite.node,
-            1
-          );
-          this._nodeTab.loadingRec.active = false;
-        },
-        () => {
-          this._nodeTab.loadingRec.active = false;
-        }
-      );
-    }
-
-    // 获取商品列表，提前把数据拿下来
-    this.reqShopList();
-  }
-
-  private registerListener() {
-    GButton.BandClick(this._nodeTab.settingBtn, this.openSetting, this);
-    GButton.BandClick(this._nodeTab.msgBoxBtn, this.openMsgBox, this);
-
-    GButton.BandClick(this._nodeTab.ChatWithRecBtn, this.chatWithRec, this);
-
-    GButton.BandClick(this._nodeTab.ShopPanelEntry, this.enterShop, this);
-
-    Utils.addInnerEL(InnerMsgCode.LanguageChange, this, () => {
-      this.recName.string = LanguageUtils.getText(this.rectNameKey);
-    });
-    Utils.addInnerEL(InnerMsgCode.BalanceChange, this, () => {
-      this.refreshCoinNum();
-    });
-    Utils.addInnerEL(InnerMsgCode.VipExpireChange, this, () => {
-      this.refreshVipExpire();
-    });
-  }
-
-  enterShop() {
-    ViewManager.I.openBundlesView("PurchasePanel");
-  }
-
-  chatWithRec() {
-    const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-
-    // 是否已经解锁
-    const isRelease = girlData.getIsRelease(
-      girlData.getGrilCategoryById(this.recId).toString(),
-      this.recId
-    );
-    const isFree =
-      girlData.getGrilPrice(
-        girlData.getGrilCategoryById(this.recId).toString(),
-        this.recId
-      ) == 0;
-    if (isRelease || isFree) {
-      NavigationManager.Instance.navigateToGirlDetail(this.recId);
-      GameRootUI.I.hideDefaultView();
-    } else {
-      //未解锁
-      ViewManager.I.openBundlesPopupView("GirlListPopupPanel", {
-        base: this,
-        category: girlData.getGrilCategoryById(this.recId),
-        id: this.recId,
-      });
-    }
-  }
-
-  openSetting() {
-    ViewManager.I.openBundlesView("SettingPanel");
-  }
-
-  openMsgBox() {
-    console.log("打开信箱");
-  }
-
-  // 刷新余额
-  private refreshCoinNum() {
-    const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
-    const balance = walletData.getOriginalBalance();
-    this.coinNum.string = balance.toString();
-  }
-
-  // 刷新 vip失效时间戳
-  private refreshVipExpire() {
-    const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
-    const vipExpire = walletData.vipExpire;
-    const leftTime = Utils.formatVipLeftTime(vipExpire);
-    this.vipLeftTime.string = LanguageUtils.getText(
-      "purchasepanel.vip_left"
-    ).replace("${leftTime}", leftTime);
-  }
-
-  // 获取商品列表
-  async reqShopList() {
-    // 请求购买商品
-    const reqData = {};
-    let res = await ShopService.I.reqShopList(reqData);
-    if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
-      const resData = res.data;
-      // 保存数据
-      const shopData = DataManager.I.getDataById<ShopData>(DataId.Shop);
-      shopData.goods = res.data;
-    }
-  }
-
-  onDestroy(): void {
-    Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => {
-      this.recName.string = LanguageUtils.getText(this.rectNameKey);
-    });
-    Utils.removeInnerEL(InnerMsgCode.BalanceChange, this, () => {});
-    Utils.removeInnerEL(InnerMsgCode.VipExpireChange, this, () => {});
-  }
-}

assets/Scripts/chat18x/ui/panels/MainPanel.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "07c2bbbb-c191-4393-87d2-5c233eb8f756",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

assets/Scripts/chat18x/ui/panels/ThemePanel.ts

@@ -77,7 +77,6 @@ export class ThemePanel extends li_BaseView {
         this.cache[i].node.destroy();
       }
     }
-    this._nodeTab.loadingRec.active = true;
     // 请求主题数据
     const reqData = {};
     let res = await ThemeService.I.reqHallTheme(reqData);
@@ -119,10 +118,6 @@ export class ThemePanel extends li_BaseView {
             this.recSprite.node,
             1
           );
-          this._nodeTab.loadingRec.active = false;
-        },
-        () => {
-          this._nodeTab.loadingRec.active = false;
         }
       );
     }

assets/Scripts/chat18x/uiitems/DetailImageItem.ts

@@ -37,9 +37,6 @@ export class DetailImageItem extends Component {
   @property(Label)
   videoPrice: Label;
 
-  @property(Node)
-  loading: Node;
-
   base: GirlDetailPanel;
   url: string;
   isImage: boolean;
@@ -149,8 +146,6 @@ export class DetailImageItem extends Component {
 
     this.test_resID = this.node.getChildByName("resID");
 
-    this.loading.active = true;
-
     this.test_resID.getComponent(Label).string =
       this.girlId.toString() + this.resId;
 
@@ -216,7 +211,6 @@ export class DetailImageItem extends Component {
     ResManager.I.changeBundleSpriteFrame(this.img, imgPath, "Girls", () => {
       this.question.active = false; // 图片加载成功后隐藏问号
       this.scaleToFillItem();
-      this.loading.active = false;
     });
   }
 

assets/Scripts/chat18x/uiitems/GirlListItem.ts

@@ -39,9 +39,6 @@ export class GirlListItem extends Component {
   @property(Node)
   chatIcon: Node;
 
-  @property(Node)
-  loading: Node;
-
   @property(Node)
   starParent: Node;
 
@@ -140,7 +137,7 @@ export class GirlListItem extends Component {
       this.category.toString(),
       this.id
     );
-    this.loading.active = true;
+
     //listAvatarPath = listAvatarPath.replace("Avatar", "avatar"); //临时
     ResManager.I.changeBundleSpriteFrame(
       this.avatar,
@@ -153,7 +150,6 @@ export class GirlListItem extends Component {
           this.avatar.node,
           2
         );
-        this.loading.active = false;
       }
     );
 

assets/Scripts/chat18x/uiitems/ThemeItem.ts

@@ -19,9 +19,6 @@ export class ThemeItem extends Component {
   @property(Label)
   titleName: Label;
 
-  @property(Node)
-  loading: Node;
-
   @property(Sprite)
   img: Sprite;
 
@@ -42,16 +39,13 @@ export class ThemeItem extends Component {
   }
 
   refresh(themeId: number) {
-    this.loading.active = true;
     // 主题数据
     const themeData = DataManager.I.getDataById<ThemeData>(DataId.Theme);
     this.lockImg.node.active = this.lockCover.node.active =
       !themeData.getIsReleaseById(themeId);
     this.isLocked = !themeData.getIsReleaseById(themeId);
     this.key = themeData.getLanKeyById(themeId);
-    this.titleName.string = LanguageUtils.getText(
+    this.titleName.string = LanguageUtils.getText(themeData.getLanKeyById(themeId));
-      themeData.getLanKeyById(themeId)
-    );
     this.category = themeData.getCategoryById(themeId);
     ResManager.I.changeBundleSpriteFrame(
       this.img,
@@ -60,7 +54,6 @@ export class ThemeItem extends Component {
       () => {
         let sizeTran = this.img.node.parent.getComponent(UITransform);
         Utils.adjustBgPixelRatioToSize(sizeTran.contentSize, this.img.node, 3);
-        this.loading.active = false;
       }
     );
     GButton.RemoveAndBandClick(this.node, this.OnClickThis, this);

assets/bundles/Chat18x/GirlDetailPanel.prefab

@@ -25,20 +25,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 401
+        "__id__": 389
       },
       {
-        "__id__": 403
+        "__id__": 391
       },
       {
-        "__id__": 405
+        "__id__": 393
       },
       {
-        "__id__": 407
+        "__id__": 395
       }
     ],
     "_prefab": {
-      "__id__": 409
+      "__id__": 397
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,23 +82,23 @@
         "__id__": 3
       },
       {
-        "__id__": 383
+        "__id__": 371
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 394
+        "__id__": 382
       },
       {
-        "__id__": 396
+        "__id__": 384
       },
       {
-        "__id__": 398
+        "__id__": 386
       }
     ],
     "_prefab": {
-      "__id__": 400
+      "__id__": 388
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -148,17 +148,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 376
+        "__id__": 364
       },
       {
-        "__id__": 378
+        "__id__": 366
       },
       {
-        "__id__": 380
+        "__id__": 368
       }
     ],
     "_prefab": {
-      "__id__": 382
+      "__id__": 370
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7107,39 +7107,36 @@
       {
         "__id__": 315
       },
+      {
+        "__id__": 321
+      },
       {
         "__id__": 327
       },
       {
-        "__id__": 333
+        "__id__": 347
-      },
-      {
-        "__id__": 339
-      },
-      {
-        "__id__": 359
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 365
+        "__id__": 353
       },
       {
-        "__id__": 367
+        "__id__": 355
       },
       {
-        "__id__": 369
+        "__id__": 357
       },
       {
-        "__id__": 371
+        "__id__": 359
       },
       {
-        "__id__": 373
+        "__id__": 361
       }
     ],
     "_prefab": {
-      "__id__": 375
+      "__id__": 363
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7303,164 +7300,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 308
-    },
-    "_prefab": {
-      "__id__": 316
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 315
-    },
-    "asset": {
-      "__uuid__": "bf652567-4b2f-4169-937f-6d12f0d9c354",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "63H2+Zfo9PcI21HLgBNY8H",
-    "instance": {
-      "__id__": 317
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "5aq5NQVTtNVprrUtYeMaUN",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 318
-      },
-      {
-        "__id__": 320
-      },
-      {
-        "__id__": 321
-      },
-      {
-        "__id__": 322
-      },
-      {
-        "__id__": 323
-      },
-      {
-        "__id__": 325
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 319
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "loadingItem"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "63H2+Zfo9PcI21HLgBNY8H"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 319
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 319
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 319
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 324
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 341,
-      "height": 438
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "73fdjB38ZHe5MjwXKxuB5t"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 326
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 341,
-      "height": 438
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "856w1D9j5E44Lcq2R0y9vO"
-    ]
-  },
   {
     "__type__": "cc.Node",
     "_name": "question",
@@ -7473,14 +7312,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 328
+        "__id__": 316
       },
       {
-        "__id__": 330
+        "__id__": 318
       }
     ],
     "_prefab": {
-      "__id__": 332
+      "__id__": 320
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7517,11 +7356,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 327
+      "__id__": 315
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 329
+      "__id__": 317
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7545,11 +7384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 327
+      "__id__": 315
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 331
+      "__id__": 319
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7609,14 +7448,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 334
+        "__id__": 322
       },
       {
-        "__id__": 336
+        "__id__": 324
       }
     ],
     "_prefab": {
-      "__id__": 338
+      "__id__": 326
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7653,11 +7492,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 333
+      "__id__": 321
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 335
+      "__id__": 323
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7681,11 +7520,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 333
+      "__id__": 321
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 337
+      "__id__": 325
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7743,26 +7582,26 @@
     },
     "_children": [
       {
-        "__id__": 340
+        "__id__": 328
       },
       {
-        "__id__": 346
+        "__id__": 334
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 352
+        "__id__": 340
       },
       {
-        "__id__": 354
+        "__id__": 342
       },
       {
-        "__id__": 356
+        "__id__": 344
       }
     ],
     "_prefab": {
-      "__id__": 358
+      "__id__": 346
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7799,20 +7638,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 339
+      "__id__": 327
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 341
+        "__id__": 329
       },
       {
-        "__id__": 343
+        "__id__": 331
       }
     ],
     "_prefab": {
-      "__id__": 345
+      "__id__": 333
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7849,11 +7688,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 340
+      "__id__": 328
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 342
+      "__id__": 330
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -7877,11 +7716,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 340
+      "__id__": 328
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 344
+      "__id__": 332
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -7958,20 +7797,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 339
+      "__id__": 327
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 347
+        "__id__": 335
       },
       {
-        "__id__": 349
+        "__id__": 337
       }
     ],
     "_prefab": {
-      "__id__": 351
+      "__id__": 339
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8008,11 +7847,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 348
+      "__id__": 336
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8036,11 +7875,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 346
+      "__id__": 334
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 350
+      "__id__": 338
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8094,11 +7933,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 339
+      "__id__": 327
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 353
+      "__id__": 341
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8122,11 +7961,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 339
+      "__id__": 327
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 355
+      "__id__": 343
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8167,11 +8006,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 339
+      "__id__": 327
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 357
+      "__id__": 345
     },
     "_alignFlags": 9,
     "_target": null,
@@ -8222,14 +8061,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 360
+        "__id__": 348
       },
       {
-        "__id__": 362
+        "__id__": 350
       }
     ],
     "_prefab": {
-      "__id__": 364
+      "__id__": 352
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8266,11 +8105,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 359
+      "__id__": 347
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 361
+      "__id__": 349
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8294,11 +8133,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 359
+      "__id__": 347
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 363
+      "__id__": 351
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8379,7 +8218,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 366
+      "__id__": 354
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8407,7 +8246,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 368
+      "__id__": 356
     },
     "clickEvents": [],
     "_interactable": true,
@@ -8465,25 +8304,22 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 370
+      "__id__": 358
     },
     "img": {
       "__id__": 312
     },
     "question": {
-      "__id__": 327
+      "__id__": 315
     },
     "video": {
-      "__id__": 336
+      "__id__": 324
     },
     "priceFrame": {
-      "__id__": 339
+      "__id__": 327
     },
     "videoPrice": {
-      "__id__": 343
+      "__id__": 331
-    },
-    "loading": {
-      "__id__": 315
     },
     "_id": ""
   },
@@ -8501,7 +8337,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 372
+      "__id__": 360
     },
     "_type": 0,
     "_inverted": false,
@@ -8523,7 +8359,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 374
+      "__id__": 362
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8582,7 +8418,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 377
+      "__id__": 365
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8610,7 +8446,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 379
+      "__id__": 367
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8655,7 +8491,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 381
+      "__id__": 369
     },
     "_alignFlags": 45,
     "_target": null,
@@ -8706,20 +8542,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 384
+        "__id__": 372
       },
       {
-        "__id__": 386
+        "__id__": 374
       },
       {
-        "__id__": 388
+        "__id__": 376
       },
       {
-        "__id__": 391
+        "__id__": 379
       }
     ],
     "_prefab": {
-      "__id__": 393
+      "__id__": 381
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -8756,11 +8592,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 383
+      "__id__": 371
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 385
+      "__id__": 373
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8784,11 +8620,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 383
+      "__id__": 371
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 387
+      "__id__": 375
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -8829,15 +8665,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 383
+      "__id__": 371
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 389
+      "__id__": 377
     },
     "clickEvents": [
       {
-        "__id__": 390
+        "__id__": 378
       }
     ],
     "_interactable": true,
@@ -8877,7 +8713,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 383
+      "__id__": 371
     },
     "_id": ""
   },
@@ -8901,11 +8737,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 383
+      "__id__": 371
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 392
+      "__id__": 380
     },
     "_alignFlags": 9,
     "_target": null,
@@ -8954,7 +8790,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 395
+      "__id__": 383
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -8982,7 +8818,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 397
+      "__id__": 385
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -9027,7 +8863,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 399
+      "__id__": 387
     },
     "_alignFlags": 45,
     "_target": null,
@@ -9076,7 +8912,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 402
+      "__id__": 390
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -9104,7 +8940,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 404
+      "__id__": 392
     },
     "_alignFlags": 45,
     "_target": null,
@@ -9140,7 +8976,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 406
+      "__id__": 394
     },
     "_id": ""
   },
@@ -9158,7 +8994,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 408
+      "__id__": 396
     },
     "m_rootNode": null,
     "videoArea": {
@@ -9189,7 +9025,7 @@
       "__id__": 102
     },
     "imgItemInst": {
-      "__id__": 369
+      "__id__": 357
     },
     "imgsLayout": {
       "__id__": 275
@@ -9210,11 +9046,6 @@
     },
     "fileId": "24mSBg+Z9OS5KNS5Yscqr0",
     "instance": null,
-    "targetOverrides": null,
+    "targetOverrides": null
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 315
-      }
-    ]
   }
 ]

assets/bundles/Chat18x/MainPanel.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "a2ea15da-490b-4cbe-8f31-2790a134459b",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "MainPanel"
-  }
-}

assets/bundles/Chat18x/ShowPanel.prefab

@@ -22,29 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       },
       {
-        "__id__": 16
+        "__id__": 18
-      },
-      {
-        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 28
       },
       {
-        "__id__": 38
+        "__id__": 30
       },
       {
-        "__id__": 40
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -77,7 +74,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "SpriteSplash-001",
+    "_name": "SpriteSplash",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -94,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -154,7 +154,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "29w+tG7ExGh4i60/SATtE8"
+    "fileId": "110iG9EytA1YAB0wVNQw+A"
   },
   {
     "__type__": "cc.Sprite",
@@ -199,7 +199,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e7KGuNOqZErKofvq3f46aX"
+    "fileId": "f0CR2UEFFOF6PU6TRY202K"
   },
   {
     "__type__": "cc.Widget",
@@ -235,7 +235,63 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "01/NlVd3NNZ6qKuftPetJ8"
+    "fileId": "f6j/k9YUFHCaZUOQEfX2Wf"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 0,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "74vW3BgyFGHKbowSkSx8rg"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -245,7 +301,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e8ky/PljxPv6194X3qOOaf",
+    "fileId": "847WtxRnVLRZqyVBgRKHkS",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -262,14 +318,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 13
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -306,11 +362,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 14
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -334,11 +390,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -393,17 +449,17 @@
     },
     "_children": [
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -440,20 +496,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 16
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 20
       },
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -490,11 +546,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -518,11 +574,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_resourceType": 1,
     "_remoteURL": "",
@@ -561,11 +617,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 16
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -596,240 +652,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "SpriteSplash",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 27
-      },
-      {
-        "__id__": 29
-      },
-      {
-        "__id__": 31
-      },
-      {
-        "__id__": 33
-      }
-    ],
-    "_prefab": {
-      "__id__": 35
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 26
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 28
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 1080,
-      "height": 2340
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "110iG9EytA1YAB0wVNQw+A"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 26
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 30
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 0
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f0CR2UEFFOF6PU6TRY202K"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 26
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 32
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 100,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f6j/k9YUFHCaZUOQEfX2Wf"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 26
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 34
-    },
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 0,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": null,
-    "_hoverSprite": null,
-    "_pressedSprite": null,
-    "_disabledSprite": null,
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 26
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "74vW3BgyFGHKbowSkSx8rg"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "847WtxRnVLRZqyVBgRKHkS",
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -840,7 +662,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -868,7 +690,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 31
     },
     "_alignFlags": 45,
     "_target": null,
@@ -904,20 +726,20 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 33
     },
     "m_rootNode": null,
     "image": {
-      "__id__": 13
+      "__id__": 15
     },
     "splash": {
-      "__id__": 29
+      "__id__": 5
     },
     "videoArea": {
-      "__id__": 23
+      "__id__": 25
     },
     "videoPlayer": {
-      "__id__": 20
+      "__id__": 22
     },
     "_id": ""
   },
@@ -934,6 +756,7 @@
       "__id__": 0
     },
     "fileId": "18xipwdnNNI6CKhTGcIHEq",
-    "instance": null
+    "instance": null,
+    "targetOverrides": null
   }
 ]

assets/bundles/Chat18x/UI.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "5055a3d1-756b-4ac3-9e5b-2211d11145a6",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}