Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

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

@@ -0,0 +1,26 @@
+import { _decorator, Button, Component, Node } from "cc";
+import li_BaseView from "../../../Main/Common/li_BaseView";
+import Utils from "../../../Main/Common/Utils";
+import { GButton } from "../../../Main/Common/GButton";
+const { ccclass, property } = _decorator;
+
+@ccclass("PopupGirlListPanel")
+export class PopupGirlListPanel extends li_BaseView {
+  private _nodeTab: any = {};
+
+  private girlId: number;
+
+  openUIDataCT(data) {
+    this.girlId = data;
+  }
+  onLoadCT() {
+    Utils.parseNode(this.node, this._nodeTab);
+  }
+  registerListener() {
+    GButton.BandClick(this._nodeTab.BuyBtn, this.buyCharacter, this);
+  }
+  buyCharacter() {
+    // 购买id为girlId的女生
+    console.log(this.girlId);
+  }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "5d94228f-b43d-4fd7-8cb6-0336edbff11b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundles/Chat18x/ChatPanel.prefab

@@ -1911,6 +1911,8 @@
       "__id__": 0
     },
     "fileId": "69iHXwwNhJmK72DMPkk2Wk",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2770,7 +2772,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 11,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -2932,7 +2934,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1962
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2961,8 +2963,8 @@
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 178,
+    "_top": 0,
-    "_bottom": 200,
+    "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -3584,6 +3586,8 @@
       "__id__": 0
     },
     "fileId": "c4MQuwEUpHGpnsXNkYYrYs",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -6705,6 +6709,8 @@
       "__id__": 0
     },
     "fileId": "a4Nb4ZSDFOqYcn9TAsyUu5",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

assets/bundles/Chat18x/PopupGIrlListPanel.prefab

@@ -44,10 +44,13 @@
       },
       {
         "__id__": 120
+      },
+      {
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 124
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1057,7 +1060,7 @@
         "__id__": 66
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 72
@@ -2842,6 +2845,25 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "d1s++F71pCoo/ePChgCcoU"
   },
+  {
+    "__type__": "5d942KPtD1P14y2Azbtv/Eb",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 123
+    },
+    "m_rootNode": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "010N5nyQBFzb5OtX6ndt1Y"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {