update

assets/Scripts/Sub/UI/PreloadUI.ts

@@ -72,6 +72,9 @@ export class PreloadUI extends Component {
 
   private appVersion: Label;
   private progressNode: Node;
+
+  private loginLabel: Label;
+  private desc: Label;
   start() {
     //Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt)
     Utils.parseNode(this.node, this._nodeTab);
@@ -84,6 +87,9 @@ export class PreloadUI extends Component {
     this.appVersion.string = `app version: ${prodConfig.appVersion}`;
     this.VideoPlayer = this._nodeTab.VideoPlayer.getComponent(VideoPlayer);
 
+    this.loginLabel = this._nodeTab.loginLabel.getComponent(Label);
+    this.desc = this._nodeTab.Desc.getComponent(Label);
+
     this.VideoPlayer.node.on(
       VideoPlayer.EventType.META_LOADED,
       this.onVideoReadyToPlay,
@@ -105,6 +111,24 @@ export class PreloadUI extends Component {
 
     if (!this.VideoPlayer.isPlaying) this.VideoPlayer.play();
 
+    //初始化显示
+    switch (LanguageUtils.CurrentLanguage) {
+      case LanguageType.CN:
+        this.loginLabel.string = "登录";
+        this.desc.string = "释放你的所有欲望";
+        break;
+      case LanguageType.EN:
+        this.loginLabel.string = "LOG  IN";
+        this.desc.string = "Unleash All Your Desires";
+        break;
+      case LanguageType.HI:
+        this.loginLabel.string = "लॉग इन";
+        this.desc.string = "अपनी सारी इच्छाओं को मुक्त करें";
+        break;
+      default:
+        break;
+    }
+
     // 初始化配置
     ConfigManager.I.init();
     //logger.log(ConfigManager.tables.TbGlobalConfig.GameName);

assets/Scripts/chat18x/ui/components/DialogBubble.ts

@@ -15,6 +15,7 @@ import { DataId, DataManager } from "../../data/DataManager";
 import { NavigationManager } from "../../manager/NavigationManager";
 import ResManager from "../../../Main/Manager/ResManager";
 import { EnvData } from "../../data/EnvData";
+import { WalletData } from "../../data/WalletData";
 const { ccclass, property } = _decorator;
 
 @ccclass("DialogBubble")
@@ -28,6 +29,9 @@ export class DialogBubble extends Component {
   @property(UITransform)
   contentT: UITransform = null;
 
+  @property(Node)
+  vipFrame: Node = null;
+
   fixMaxWidth: number;
 
   uiTransform: UITransform;
@@ -54,8 +58,13 @@ export class DialogBubble extends Component {
 
     this.content.overflow = Overflow.NONE;
 
+    let isVip = false;
+
     //设置头像
     if (isPlayer) {
+      const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
+      isVip = walletData.isVip;
+
       //获取玩家头像，等接入luffa
     } else {
       const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
@@ -85,6 +94,7 @@ export class DialogBubble extends Component {
       }
       return;
     }
+    if (this.vipFrame) this.vipFrame.active = isVip;
 
     // 设置文本内容
     this.content.string = str;

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

@@ -219,11 +219,14 @@ export class GirlDetailPanel extends li_BaseView {
       for (let i = 0; i < stars.length; i++) {
         const element = stars[i];
         if (star > i) {
-          ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
+          ResManager.I.changeResourceSpriteFrame(
+            element,
+            "ui/common/heart/heart"
+          );
         } else {
           ResManager.I.changeResourceSpriteFrame(
             element,
-            "ui/common/heart_empty"
+            "ui/common/heart/heart_empty"
           );
         }
       }

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

@@ -1,4 +1,12 @@
-import { _decorator, Component, Node, instantiate, tween, Vec3 } from "cc";
+import {
+  _decorator,
+  Component,
+  Node,
+  instantiate,
+  tween,
+  Vec3,
+  Label,
+} 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";
@@ -8,6 +16,8 @@ import { DataManager, DataId } from "../../data/DataManager";
 import { GirlData } from "../../data/GirlData";
 import proto from "db://assets/Scripts/proto/proto.pb.js";
 import { NavigationManager, PanelType } from "../../manager/NavigationManager";
+import { ThemeData } from "../../data/ThemeData";
+import LanguageUtils from "../../../Main/Common/LanguageUtils";
 
 const { ccclass, property } = _decorator;
 
@@ -24,6 +34,9 @@ export class GirlListPanel extends li_BaseView {
   private itemPool: GirlListItem[] = [];
   private maxPoolSize: number = 20;
 
+  private title1: Label;
+  private title2: Label;
+
   category: number;
 
   onLoadCT() {
@@ -36,6 +49,10 @@ export class GirlListPanel extends li_BaseView {
     this.itemInst = this._nodeTab.BubbleItem.getComponent(GirlListItem);
     this.itemInst.node.active = false;
     this.content = this._nodeTab.content;
+
+    this.title1 = this._nodeTab.title1.getComponent(Label);
+    this.title2 = this._nodeTab.title2.getComponent(Label);
+
     this.refresh();
   }
 
@@ -90,6 +107,11 @@ export class GirlListPanel extends li_BaseView {
       this.cache = [];
     }
 
+    // 主题数据
+    const themeData = DataManager.I.getDataById<ThemeData>(DataId.Theme);
+    const key = themeData.getLanKeyById(1001 + category);
+    this.title1.string = this.title2.string = LanguageUtils.getText(key);
+
     // 请求列表
     const reqData = {
       category,

assets/Scripts/chat18x/uiitems/GirlListItem.ts

@@ -92,15 +92,13 @@ export class GirlListItem extends Component {
     this.nameKey = girlData.getGrilName(this.category.toString(), this.id);
     this.girlName.string = LanguageUtils.getText(this.nameKey);
     this.tagKey = girlData.getGrilTagKey(this.category.toString(), this.id);
-    // 是否已经解锁
+    // let desc = "";
-    const isRelease = girlData.getIsRelease(this.category.toString(), this.id);
+    // const tags = LanguageUtils.getText(this.tagKey).split("|");
-    let desc = "";
+    // for (let i = 0; i < tags.length; i++) {
-    const tags = LanguageUtils.getText(this.tagKey).split("|");
+    //   if (i != 0) desc += "|";
-    for (let i = 0; i < tags.length; i++) {
+    //   desc += tags[i];
-      if (i != 0) desc += "|";
+    // }
-      desc += tags[i];
+    this.tags.string = LanguageUtils.getText(this.tagKey);
-    }
-    this.tags.string = desc;
     let priceType = girlData.getGrilPriceType(
       this.category.toString(),
       this.id
@@ -126,11 +124,14 @@ export class GirlListItem extends Component {
     for (let i = 0; i < this.stars.length; i++) {
       const element = this.stars[i];
       if (star > i) {
-        ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart/heart"
+        );
       } else {
         ResManager.I.changeResourceSpriteFrame(
           element,
-          "ui/common/heart_empty"
+          "ui/common/heart/heart_empty"
         );
       }
     }

assets/Scripts/chat18x/uiitems/PastGirlListItem.ts

@@ -73,11 +73,14 @@ export class PastGirlListItem extends Component {
     for (let i = 0; i < this.stars.length; i++) {
       const element = this.stars[i];
       if (star > i) {
-        ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart/heart"
+        );
       } else {
         ResManager.I.changeResourceSpriteFrame(
           element,
-          "ui/common/heart_empty"
+          "ui/common/heart/heart_empty"
         );
       }
     }
@@ -99,13 +102,13 @@ export class PastGirlListItem extends Component {
     this.tagKey = girlData.getGrilTagKey(this.category.toString(), this.id);
 
     // 标签显示
-    let desc = "";
+    // let desc = "";
-    const tags = LanguageUtils.getText(this.tagKey).split("|");
+    // const tags = LanguageUtils.getText(this.tagKey).split("|");
-    for (let i = 0; i < tags.length; i++) {
+    // for (let i = 0; i < tags.length; i++) {
-      if (i != 0) desc += "|";
+    //   if (i != 0) desc += "|";
-      desc += tags[i];
+    //   desc += tags[i];
-    }
+    // }
-    this.tags.string = desc;
+    this.tags.string = LanguageUtils.getText(this.tagKey);
 
     // 由于都是已解锁的，直接显示聊天图标
     this.starParent.active = true;
@@ -125,11 +128,14 @@ export class PastGirlListItem extends Component {
     for (let i = 0; i < this.stars.length; i++) {
       const element = this.stars[i];
       if (star > i) {
-        ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart/heart"
+        );
       } else {
         ResManager.I.changeResourceSpriteFrame(
           element,
-          "ui/common/heart_empty"
+          "ui/common/heart/heart_empty"
         );
       }
     }

assets/Scripts/chat18x/uiitems/RecomandItem.ts

@@ -64,9 +64,15 @@ export class RecomandItem extends Component {
     for (let i = 0; i < this.hearts.length; i++) {
       const element = this.hearts[i];
       if (starCount > i) {
-        ResManager.I.changeResourceSpriteFrame(element, "ui/common/ZY_UI_AX1");
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart/heart"
+        );
       } else {
-        ResManager.I.changeResourceSpriteFrame(element, "ui/common/ZY_UI_AX2");
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart/heart_empty"
+        );
       }
     }
 

assets/bundles/Chat18x/ChargePopPanel.prefab

@@ -28,26 +28,26 @@
         "__id__": 18
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 30
+        "__id__": 34
       },
       {
-        "__id__": 44
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 58
       },
       {
-        "__id__": 54
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -426,10 +426,13 @@
       },
       {
         "__id__": 21
+      },
+      {
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -559,6 +562,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f25oPUNSVPeqzlVJ7SzBg7"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 24
+    },
+    "languageKey": "chargepoppanel.tips",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "14lAuuIChEJaX4wRDsumz3"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -584,14 +608,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 27
       },
       {
-        "__id__": 27
+        "__id__": 29
+      },
+      {
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -628,11 +655,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 26
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -656,11 +683,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -721,6 +748,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "3eRD0gTxxBeofTw9O6Ga76"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 32
+    },
+    "languageKey": "chargepoppanel.lackofmoney",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "01bbdv6Z1HLI6zOSCaCCT1"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -744,23 +792,23 @@
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 43
       },
       {
-        "__id__": 39
+        "__id__": 45
       },
       {
-        "__id__": 41
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -797,20 +845,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       },
       {
-        "__id__": 34
+        "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -847,11 +898,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 33
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -875,11 +926,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -940,6 +991,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "c7CC+n3ZpB4J1ZAlkMZYXM"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "languageKey": "personalpanel.gocharge",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2dppnjA/9LWZDQuoqJ2Ra6"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -959,11 +1031,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 44
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -987,11 +1059,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1032,11 +1104,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 48
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1107,17 +1179,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 51
       },
       {
-        "__id__": 47
+        "__id__": 53
       },
       {
-        "__id__": 49
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1154,11 +1226,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 52
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1182,11 +1254,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 54
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1227,11 +1299,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 56
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1271,7 +1343,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 44
+      "__id__": 50
     },
     "_id": ""
   },
@@ -1302,7 +1374,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1330,7 +1402,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 61
     },
     "m_rootNode": null,
     "_id": ""

assets/bundles/Chat18x/ChatPanel.prefab

@@ -1726,6 +1726,7 @@
     "contentT": {
       "__id__": 96
     },
+    "vipFrame": null,
     "_id": ""
   },
   {
@@ -2613,6 +2614,9 @@
     "contentT": {
       "__id__": 144
     },
+    "vipFrame": {
+      "__id__": 128
+    },
     "_id": ""
   },
   {
@@ -4530,6 +4534,8 @@
       "__id__": 0
     },
     "fileId": "c4MQuwEUpHGpnsXNkYYrYs",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -9548,6 +9554,7 @@
       "__id__": 0
     },
     "fileId": "9acrf4umFDJZb/7fu6tsb6",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "b74d98b5-cded-438b-aa35-efecb6e3d293",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "GirlListPopupPanel-Fix"
-  }
-}

assets/bundles/Chat18x/NavigationPanel.prefab

@@ -2248,7 +2248,7 @@
     "__prefab": {
       "__id__": 93
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.rank",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -2574,7 +2574,7 @@
     "__prefab": {
       "__id__": 107
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.rank",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -3300,7 +3300,7 @@
     "__prefab": {
       "__id__": 139
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.chat",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -3626,7 +3626,7 @@
     "__prefab": {
       "__id__": 153
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.chat",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -4352,7 +4352,7 @@
     "__prefab": {
       "__id__": 185
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.me",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -4678,7 +4678,7 @@
     "__prefab": {
       "__id__": 199
     },
-    "languageKey": "navigation.home",
+    "languageKey": "navigation.me",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""

assets/bundles/Chat18x/PopupGirlDetailPanel.prefab

@@ -28,14 +28,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 92
       },
       {
-        "__id__": 90
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 96
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -278,26 +278,26 @@
         "__id__": 35
       },
       {
-        "__id__": 43
+        "__id__": 45
       },
       {
-        "__id__": 55
+        "__id__": 59
       },
       {
-        "__id__": 73
+        "__id__": 77
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 87
       },
       {
-        "__id__": 85
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 91
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -827,10 +827,13 @@
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -996,6 +999,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "f5lvqk9X5ICK9ow9tjHaIo"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
+    "languageKey": "popupgirldetailpanel.release",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "853HMnvVxO459T4BFeA9Ob"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1019,20 +1043,20 @@
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 54
       },
       {
-        "__id__": 52
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1069,20 +1093,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 43
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 47
       },
       {
-        "__id__": 47
+        "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1119,11 +1146,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1147,11 +1174,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1212,6 +1239,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "2cdQkUpzFFf58GeSAzvbme"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 52
+    },
+    "languageKey": "popupgirldetailpanel.confirm",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "caqD8lah5Dt486MNiZjDS+"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1231,11 +1279,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1259,11 +1307,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1321,23 +1369,23 @@
     },
     "_children": [
       {
-        "__id__": 56
+        "__id__": 60
       },
       {
-        "__id__": 62
+        "__id__": 66
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 72
       },
       {
-        "__id__": 70
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1374,20 +1422,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 55
+      "__id__": 59
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 61
       },
       {
-        "__id__": 59
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1424,11 +1472,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 62
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1452,11 +1500,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 64
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1536,20 +1584,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 55
+      "__id__": 59
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 67
       },
       {
-        "__id__": 65
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1586,11 +1634,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1614,11 +1662,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1672,11 +1720,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1700,11 +1748,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1763,21 +1811,21 @@
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 74
-      },
-      {
-        "__id__": 76
-      },
       {
         "__id__": 78
       },
       {
         "__id__": 80
+      },
+      {
+        "__id__": 82
+      },
+      {
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1814,11 +1862,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1842,11 +1890,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 81
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1887,11 +1935,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 83
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1931,7 +1979,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 73
+      "__id__": 77
     },
     "_id": ""
   },
@@ -1945,11 +1993,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 85
     },
     "_alignFlags": 33,
     "_target": null,
@@ -1998,7 +2046,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 88
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2026,7 +2074,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 90
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2084,7 +2132,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 93
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2112,7 +2160,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 95
     },
     "m_rootNode": null,
     "_id": ""

assets/bundles/Chat18x/RecordPanel.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "a62646a7-32f3-4560-9f53-f3e476752922",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "RecordPanel"
-  }
-}

assets/bundles/Chat18x/SettingPanel.prefab

@@ -4326,7 +4326,7 @@
     "__prefab": {
       "__id__": 177
     },
-    "languageKey": "settingpanel.music",
+    "languageKey": "settingpanel.sound",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -5297,7 +5297,7 @@
     "__prefab": {
       "__id__": 217
     },
-    "languageKey": "settingpanel.music",
+    "languageKey": "settingpanel.language",
     "defaultText": "",
     "autoUpdate": true,
     "_id": ""
@@ -5597,6 +5597,8 @@
       "__id__": 0
     },
     "fileId": "e3965QO7BNH6J1lGQWWrZn",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -6126,6 +6128,8 @@
       "__id__": 0
     },
     "fileId": "ad+JOqXVVBgJzQOCZa3yWE",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -6499,6 +6503,8 @@
       "__id__": 0
     },
     "fileId": "8aIGTJb8xH7Z52zp9WxCCG",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

assets/bundles/Chat18x/releasePanel.prefab

@@ -24,18 +24,18 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 8
-      },
       {
         "__id__": 10
       },
       {
         "__id__": 12
+      },
+      {
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,10 +82,13 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -215,6 +218,27 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "deG0MaO1dMh4Z1peBvoLz3"
   },
+  {
+    "__type__": "d7e4fOii5xNLqH2PF6de4pP",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "languageKey": "releasepanel.releasesuccess",
+    "defaultText": "",
+    "autoUpdate": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7e5W3GRyVPp5gq5LCEPNOu"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -238,7 +262,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -266,7 +290,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -311,7 +335,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "m_rootNode": null,
     "_id": ""

assets/resources/ui/common/heart/heart.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "08f40d20-985f-4cd8-8eb5-e4ccde3f8130@6c48a",
-      "displayName": "ZY_UI_AX1",
+      "displayName": "heart",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "08f40d20-985f-4cd8-8eb5-e4ccde3f8130@f9941",
-      "displayName": "ZY_UI_AX1",
+      "displayName": "heart",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

assets/resources/ui/common/heart/heart_empty.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "0b2fb367-73c3-4b92-b48e-7d4846c6c140@6c48a",
-      "displayName": "ZY_UI_AX2",
+      "displayName": "heart_empty",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "0b2fb367-73c3-4b92-b48e-7d4846c6c140@f9941",
-      "displayName": "ZY_UI_AX2",
+      "displayName": "heart_empty",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {