update

assets/Scenes/MainScene.scene

@@ -98,8 +98,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 360,
+      "x": 585,
-      "y": 640,
+      "y": 1266,
       "z": 0
     },
     "_lrot": {
@@ -184,7 +184,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 640,
+    "_orthoHeight": 1266,
     "_near": 0,
     "_far": 2000,
     "_color": {
@@ -532,8 +532,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 2.5,
-      "y": 1,
+      "y": 2.5,
       "z": 1
     },
     "_mobility": 0,
@@ -558,8 +558,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 480,
-      "height": 1280
+      "height": 864
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -580,10 +580,10 @@
     "__prefab": null,
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
+    "_left": 345,
-    "_right": 0,
+    "_right": 345,
-    "_top": 0,
+    "_top": 834,
-    "_bottom": 0,
+    "_bottom": 834,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -608,14 +608,17 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_resourceType": 0,
+    "_resourceType": 1,
     "_remoteURL": "",
-    "_clip": null,
+    "_clip": {
+      "__uuid__": "06ba55f7-af6a-4597-ab64-20e5534a6410",
+      "__expectedType__": "cc.VideoClip"
+    },
     "_playOnAwake": true,
     "_volume": 1,
     "_mute": false,
     "_playbackRate": 1,
-    "_loop": false,
+    "_loop": true,
     "_fullScreenOnAwake": false,
     "_stayOnBottom": true,
     "_keepAspectRatio": true,
@@ -660,8 +663,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -786,8 +789,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -886,8 +889,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -938,8 +941,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Scenes/PreloadScene.scene

@@ -52,7 +52,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 54
+      "__id__": 57
     },
     "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4"
   },
@@ -75,20 +75,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 54
       },
       {
-        "__id__": 52
+        "__id__": 55
       },
       {
-        "__id__": 53
+        "__id__": 56
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 360,
+      "x": 585,
-      "y": 640,
+      "y": 1266,
       "z": 0
     },
     "_lrot": {
@@ -173,7 +173,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 640,
+    "_orthoHeight": 1266,
     "_near": 0,
     "_far": 2000,
     "_color": {
@@ -228,33 +228,18 @@
       },
       {
         "__id__": 24
-      },
-      {
-        "__id__": 28
-      },
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 36
-      },
-      {
-        "__id__": 40
-      },
-      {
-        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_prefab": null,
@@ -347,8 +332,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1341.9,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -372,9 +357,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 56,
-      "g": 255,
+      "g": 56,
-      "b": 255,
+      "b": 56,
       "a": 255
     },
     "_spriteFrame": {
@@ -383,7 +368,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -421,7 +406,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 450,
+      "y": 1076,
       "z": 0
     },
     "_lrot": {
@@ -563,7 +548,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -400,
+      "y": -1026,
       "z": 0
     },
     "_lrot": {
@@ -732,7 +717,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -356,
+      "y": -982,
       "z": 0
     },
     "_lrot": {
@@ -960,30 +945,97 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "btnLogin",
+    "_name": "Node",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 5
     },
-    "_children": [],
+    "_children": [
-    "_active": true,
-    "_components": [
       {
         "__id__": 25
       },
       {
-        "__id__": 26
+        "__id__": 29
       },
       {
-        "__id__": 27
+        "__id__": 33
+      },
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 45
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 49
+      },
+      {
+        "__id__": 50
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -194,
+      "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": "cbgmHP/CFF1rtmMD7vJI0c"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnLogin",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 24
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": null,
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -820,
       "z": 0
     },
     "_lrot": {
@@ -1015,7 +1067,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": null,
@@ -1037,7 +1089,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": null,
@@ -1073,7 +1125,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": null,
@@ -1103,26 +1155,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 29
-      },
       {
         "__id__": 30
       },
       {
         "__id__": 31
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -283,
+      "x": -508,
-      "y": -530,
+      "y": -1156,
       "z": 0
     },
     "_lrot": {
@@ -1154,7 +1206,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": null,
@@ -1176,7 +1228,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": null,
@@ -1215,7 +1267,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": null,
@@ -1245,26 +1297,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 33
-      },
       {
         "__id__": 34
       },
       {
         "__id__": 35
+      },
+      {
+        "__id__": 36
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -225,
-      "y": -456,
+      "y": -1082,
       "z": 0
     },
     "_lrot": {
@@ -1296,7 +1348,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1318,7 +1370,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1380,7 +1432,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": null,
@@ -1410,26 +1462,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 37
-      },
       {
         "__id__": 38
       },
       {
         "__id__": 39
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -225,
-      "y": -547,
+      "y": -1173,
       "z": 0
     },
     "_lrot": {
@@ -1461,7 +1513,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": null,
@@ -1483,7 +1535,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": null,
@@ -1545,7 +1597,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": null,
@@ -1575,26 +1627,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 41
-      },
       {
         "__id__": 42
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 44
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -290,
+      "y": -916,
       "z": 0
     },
     "_lrot": {
@@ -1626,7 +1678,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1648,7 +1700,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1710,7 +1762,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 40
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1740,26 +1792,26 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 45
-      },
       {
         "__id__": 46
       },
       {
         "__id__": 47
+      },
+      {
+        "__id__": 48
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -315,
+      "y": -941,
       "z": 0
     },
     "_lrot": {
@@ -1791,7 +1843,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": null,
@@ -1813,7 +1865,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": null,
@@ -1875,7 +1927,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": null,
@@ -1899,6 +1951,58 @@
     "_lockFlags": 0,
     "_id": "e3WNioa9VOJYCiwqgrw4+9"
   },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1170,
+      "height": 2532
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "51LpH13xtAcKvHofY3HjM1"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_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": "ffSHIcdQ9MDLv6Ji+LALik"
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1911,8 +2015,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1975,8 +2079,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 1170,
-      "height": 1280
+      "height": 2532
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2034,29 +2138,29 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 55
-    },
-    "shadows": {
-      "__id__": 56
-    },
-    "_skybox": {
-      "__id__": 57
-    },
-    "fog": {
       "__id__": 58
     },
-    "octree": {
+    "shadows": {
       "__id__": 59
     },
-    "skin": {
+    "_skybox": {
       "__id__": 60
     },
-    "lightProbeInfo": {
+    "fog": {
       "__id__": 61
     },
-    "postSettings": {
+    "octree": {
       "__id__": 62
     },
+    "skin": {
+      "__id__": 63
+    },
+    "lightProbeInfo": {
+      "__id__": 64
+    },
+    "postSettings": {
+      "__id__": 65
+    },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false
   },

assets/Scripts/Main/Common/GButton.ts

@@ -61,7 +61,7 @@ export class GButton {
             }
             //点击音效处理
             if (buttonType > 0) {
-                AudioManager.I.PlayEffect(buttonType);   //音效
+                //AudioManager.I.PlayEffect(buttonType);   //音效
             }
         }, obj);
     }

assets/Scripts/Main/Common/GameRootUI.ts

@@ -29,6 +29,16 @@ export default class GameRootUI extends Component {
     @property
     public DefaultUI: string = ""   //默认打开的界面
 
+    private defaultView:Node;
+
+    showDefaultView()
+    {
+        this.defaultView.active =true;
+    }
+    hideDefaultView():void{
+        this.defaultView.active = false;
+    }
+
     onLoad() {
         GameRootUI.I = this;
     }
@@ -53,6 +63,7 @@ export default class GameRootUI extends Component {
         if (this.DefaultUI.length > 0) {
             ResManager.I.loadSubpackagePrefab(this.DefaultUI, (res)=>{
 
+                this.defaultView = res;
                 let viewSP = res.getComponent(res.name);
                 viewSP && viewSP.openUIData && viewSP.openUIData(null);
 

assets/Scripts/Main/Common/Utils.ts

@@ -148,7 +148,25 @@ export default class Utils {
         }
     }
 
-
+    /**适配背景图
+     * @method node 背景图节点
+     * @param mod 适配模式 1=按高度适配 2=按宽度适配
+     */
+    public static adjustBgPixelRatioToSize(windowSize:Size,node:Node, mod:number = 1) {
+        //let windowSize = view.getVisibleSize();
+        let bgTf = node.getComponent(UITransform)
+        if (bgTf) {
+            if (mod == 1 && bgTf.height < windowSize.height) {
+                let scale = windowSize.height / bgTf.height
+                bgTf.height = bgTf.height * scale
+                bgTf.width = bgTf.width * scale
+            } else if (mod == 2 && bgTf.width < windowSize.width) {
+                let scale = windowSize.width / bgTf.width
+                bgTf.height = bgTf.height * scale
+                bgTf.width = bgTf.width * scale
+            }
+        }
+    }
     /**适配背景图
      * @method node 背景图节点
      * @param mod 适配模式 1=按高度适配 2=按宽度适配
@@ -157,6 +175,15 @@ export default class Utils {
         let windowSize = view.getVisibleSize();
         let bgTf = node.getComponent(UITransform)
         if (bgTf) {
+            if(mod == 3)
+            {
+                if(windowSize.height-bgTf.height < windowSize.width-bgTf.width )
+                {
+                    mod = 1;
+                }else{
+                    mod = 2;
+                }
+            }
             if (mod == 1 && bgTf.height < windowSize.height) {
                 let scale = windowSize.height / bgTf.height
                 bgTf.height = bgTf.height * scale

assets/Scripts/Main/Config/InnerMsgCode.ts

@@ -22,4 +22,7 @@ export enum InnerMsgCode {
 
     BgVideo_Ready,  //背景视频准备完成
     BgVideo_End,    //背景视频播放完毕
+
+
+    Chat_DialogRefresh
 }

assets/Scripts/Main/Manager/ResManager.ts

@@ -100,7 +100,7 @@ export default class ResManager {
     }
     /** 加载bundle中的PB*/
     loadSubpackagePrefab(url: string, cb) {
-        let bundle = assetManager.getBundle("PB");
+        let bundle = assetManager.getBundle("Chat18x");
         if (bundle){
             bundle.load(url, Prefab, (err, res: Prefab) => {
                 if (err) {

assets/Scripts/Sub/MainScene.ts

@@ -19,7 +19,7 @@ export class MainScene extends Component {
         let gameRootUI = this.node.getComponent(GameRootUI)
         if (!gameRootUI){
             gameRootUI = this.node.addComponent(GameRootUI)
-            gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "UI/StartUI/Start_UI");
+            gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "GirlListPanel");
         }
         GameRootUI.MainCamera = this.MainCamera
     }

assets/Scripts/Sub/UI/PreloadUI.ts

@@ -20,22 +20,22 @@ export class PreloadUI extends Component {
     private jinduBar: Node = null;
     private jinduFilled: Sprite = null;
     private LabProgress: Label = null;
-    private btnLogin: Sprite = null; //登录按钮
+    //private btnLogin: Sprite = null; //登录按钮
 
     start() {
-        Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt)
+        //Utils.addInnerEL(InnerMsgCode.UI_ShowPrompt, this, this.resiveShowPrompt)
         
         this.jinduBar = this.node.getChildByName("jinduBar");
         this.jinduFilled = this.jinduBar.getChildByName("jinduFilled").getComponent(Sprite);
         this.LabProgress = this.node.getChildByName("LabProgress").getComponent(Label);
-        this.btnLogin = this.node.getChildByName("btnLogin").getComponent(Sprite);
+        //this.btnLogin = this.node.getChildByName("btnLogin").getComponent(Sprite);
         
         //适配背景图
         let BG = this.node.getChildByName("BG");
         Utils.adjustBgPixelRatio(BG, 1)
 
         this.jinduFilled.fillRange = 0;
-        this.btnLogin.node.active = false;
+        //this.btnLogin.node.active = false;
 
         this.preloadFiles()
     }
@@ -68,26 +68,29 @@ export class PreloadUI extends Component {
     //预加载文件
     preloadFiles() {
         let preloadTab = [
-            {path:"Music/music_interface", bundleName: "Audio", ftype: AudioClip},
+            {path:"ChatPanel", bundleName: "Chat18x", ftype: Prefab},
-            {path:"bg/mengli_stage_bg", bundleName: "Raw", ftype: ImageAsset},
+            {path:"GirlDetailPanel", bundleName: "Chat18x", ftype: Prefab},
-            {path:"cg0/mengli_0_cg", bundleName: "Raw", ftype: ImageAsset},
+            {path:"GirlListPanel", bundleName: "Chat18x", ftype: Prefab},
-            {path:"cg1/mengli_1_cg", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"Music/music_interface", bundleName: "Audio", ftype: AudioClip},
-            {path:"cg2/mengli_2_cg", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"bg/mengli_stage_bg", bundleName: "Raw", ftype: ImageAsset},
-            {path:"cg3/mengli_3_cg", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"cg0/mengli_0_cg", bundleName: "Raw", ftype: ImageAsset},
-            {path:"emo_1/mengli_shy", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"cg1/mengli_1_cg", bundleName: "Raw", ftype: ImageAsset},
-            {path:"emo_2/mengli_laugh", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"cg2/mengli_2_cg", bundleName: "Raw", ftype: ImageAsset},
-            {path:"emo_3/mengli_disgust", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"cg3/mengli_3_cg", bundleName: "Raw", ftype: ImageAsset},
-            {path:"role/mengli_default", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"emo_1/mengli_shy", bundleName: "Raw", ftype: ImageAsset},
-            {path:"Zjm/raw1", bundleName: "Raw", ftype: ImageAsset},
+            // {path:"emo_2/mengli_laugh", bundleName: "Raw", ftype: ImageAsset},
-            {path:"touming", bundleName: "common", ftype: ImageAsset},
+            // {path:"emo_3/mengli_disgust", bundleName: "Raw", ftype: ImageAsset},
-            // {path:"chanpin_1_0", bundleName: "daoju", ftype: ImageAsset},    //有合图加载失败
+            // {path:"role/mengli_default", bundleName: "Raw", ftype: ImageAsset},
-            {path:"zjm_1", bundleName: "Zhujiemian", ftype: ImageAsset},
+            // {path:"Zjm/raw1", bundleName: "Raw", ftype: ImageAsset},
-            {path:"zjm_19", bundleName: "Zhujiemian", ftype: ImageAsset},
+            // {path:"touming", bundleName: "common", ftype: ImageAsset},
-            {path:"zjm_30", bundleName: "Zhujiemian", ftype: ImageAsset},
+            // // {path:"chanpin_1_0", bundleName: "daoju", ftype: ImageAsset},    //有合图加载失败
-            {path:"mohu", bundleName: "Materials", ftype: Material},
+            // {path:"zjm_1", bundleName: "Zhujiemian", ftype: ImageAsset},
-            {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab},
+            // {path:"zjm_19", bundleName: "Zhujiemian", ftype: ImageAsset},
-            {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab},
+            // {path:"zjm_30", bundleName: "Zhujiemian", ftype: ImageAsset},
-            {path:"commonGlobal", bundleName: "DataTable", ftype: JsonAsset},
+            // {path:"mohu", bundleName: "Materials", ftype: Material},
+            // {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab},
+            // {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab},
+            // {path:"commonGlobal", bundleName: "DataTable", ftype: JsonAsset},
         ];
         let num_prefab = 0; //已加载数量
         let num_succeed = 0;//加载成功数量
@@ -117,10 +120,10 @@ export class PreloadUI extends Component {
     //加载配置表
     loadDataTable(){
         let dataArr = [
-            "commonGlobal",
+            //"commonGlobal",
             // "levelHole",
-            "Music",
+            //"Music",
-            "Sound",
+            //"Sound",
         ]
 
         //配置表使用方法： let cfgs = Resource.getConfig("Sound")
@@ -149,57 +152,58 @@ export class PreloadUI extends Component {
     //登录
     onLogin() {
         //初始化SDK信息
-        SDKManager.init(() => {
+        // SDKManager.init(() => {
-            //检测是否有授权，有授权直接登录，没有授权就先进主界面，到主界面获取权限
+        //     //检测是否有授权，有授权直接登录，没有授权就先进主界面，到主界面获取权限
-            SDKManager.checkAutoSetting("userInfo", (ishave) => {
+        //     SDKManager.checkAutoSetting("userInfo", (ishave) => {
-                if (ishave) {
+        //         if (ishave) {
-                    console.log("有授权，直接登录")
+        //             console.log("有授权，直接登录")
-                    HttpUnit.ins.login((loginData) => {
+        //             HttpUnit.ins.login((loginData) => {
-                        if (loginData == null) {
+        //                 if (loginData == null) {
-                            //登录失败，这里处理重复登录的逻辑
+        //                     //登录失败，这里处理重复登录的逻辑
-                        } else {
+        //                 } else {
-                            this.loginFinish = true   
+        //                     this.loginFinish = true
-                        }
+        //                 }
-                    })
+        //             })
-                } else {
+        //         } else {
-                    console.log("没有授权，等待授权后登录")
+        //             console.log("没有授权，等待授权后登录")
-                    // this.loginFinish = true
+        //             // this.loginFinish = true
-                    this.jinduBar.active = false
+        //             this.jinduBar.active = false
-                    this.LabProgress.node.active = false
+        //             this.LabProgress.node.active = false
-                    //登录按钮
+        //             //登录按钮
-                    this.btnLogin.node.active = true
+        //             this.btnLogin.node.active = true
-                    let loginPath = ""
+        //             let loginPath = ""
-                    if (SDKManager.isWenxin()) {
+        //             if (SDKManager.isWenxin()) {
-                        loginPath = "login1"
+        //                 loginPath = "login1"
-                    } else if (SDKManager.isByteDance()) {
+        //             } else if (SDKManager.isByteDance()) {
-                        loginPath = "login2"
+        //                 loginPath = "login2"
-                    } else if (SDKManager.isKuaishou()) {
+        //             } else if (SDKManager.isKuaishou()) {
-                        loginPath = "login3"
+        //                 loginPath = "login3"
-                    }
+        //             }
-                    ResManager.I.changeResourceSpriteFrame(this.btnLogin, loginPath)
+        //             ResManager.I.changeResourceSpriteFrame(this.btnLogin, loginPath)
-
+        //
-                    HttpUnit.ins.login((loginData) => {
+        //             HttpUnit.ins.login((loginData) => {
-                        if (loginData == null) {
+        //                 if (loginData == null) {
-                            //登录失败，这里处理重复登录的逻辑
+        //                     //登录失败，这里处理重复登录的逻辑
-                        } else {
+        //                 } else {
-                            this.loginFinish = true   
+        //                     this.loginFinish = true
-                        }
+        //                 }
-                    })
+        //             })
-                }
+        //         }
-            })
+        //     })
-        })
+        // })
+        this.loginFinish = true;
     }
     
     enterGame() {
-        let islogin = HttpUnit.IsLogin();
+        //let islogin = HttpUnit.IsLogin();
-        console.log("进入游戏，登录状态：", islogin);
+        //console.log("进入游戏，登录状态：", islogin);
         this.jinduBar.active = false
         this.LabProgress.node.active = false
-        this.btnLogin.node.active = false
+        //this.btnLogin.node.active = false
-        if (islogin) {
+        // if (islogin) {
-        } else {
+        // } else {
-            //没登录成功，先进主界面，在主界面里进行登录
+        //     //没登录成功，先进主界面，在主界面里进行登录
-        }
+        // }
         ResManager.I.goMainScene(); //进入下一个场景
         // ResManager.I.goCustomScene("Test2DScene"); //进入自定义场景
     }

assets/Scripts/test/ChatPanel.ts

@@ -2,10 +2,17 @@ import { _decorator, Component, EditBox, Node,Label } from "cc";
 import { DemoManager } from "./DemoManager";
 import { ChatGPTService } from "./ChatGPTService";
 import {characters} from "db://assets/Scripts/test/cfg/characters";
+import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
+import Utils from "db://assets/Scripts/Main/Common/Utils";
+import {InnerMsgCode} from "db://assets/Scripts/Main/Config/InnerMsgCode";
+import {ChatContentsLayout} from "db://assets/Scripts/test/ChatContentsLayout";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
+import GameRootUI from "db://assets/Scripts/Main/Common/GameRootUI";
+import {ImagePopup} from "db://assets/Scripts/test/ImagePopup";
 const { ccclass, property } = _decorator;
 
 @ccclass("ChatPanel")
-export class ChatPanel extends Component {
+export class ChatPanel extends li_BaseView {
   manager: DemoManager = null;
 
   @property(EditBox)
@@ -14,15 +21,35 @@ export class ChatPanel extends Component {
   @property(Label)
   girlName: Label = null;
 
+  @property(ChatContentsLayout)
+  layout: ChatContentsLayout = null;
+
+  @property(ImagePopup)
+  popUpImage: ImagePopup = null;
+
   id:number
+
+  onLoadCT()
+  {
+    this.register();
+  }
+  register()
+  {
+    Utils.addInnerEL(InnerMsgCode.Chat_DialogRefresh,this,this.onDialogUpdate);
+  }
   refresh(id:number) {
     this.id = id;
     const data = characters[id-1];
     this.girlName.string = data.name;
   }
-
+  onDialogUpdate()
+  {
+    this.layout.UpdateDialog(DemoManager.getInstance().getDialogs())
+  }
   protected onEnable(): void {
     if (!this.manager) this.manager = DemoManager.getInstance();
+
+    GameRootUI.I.hideDefaultView();
   }
 
   public async OnClickSend() {
@@ -31,7 +58,8 @@ export class ChatPanel extends Component {
     console.log("post:" + str);
 
     this.editBox.string = "";
-    DemoManager.getInstance().updateDialog(true, str);
+
+    DemoManager.getInstance().updateDialog(true, str,true);
 
     let ret = await ChatGPTService.getInstance().Post({
       model: "Deepseek-reasoner",
@@ -49,5 +77,19 @@ export class ChatPanel extends Component {
       this.manager.updateDialog(false, rep);
     }
     console.log("ret:" + rep);
+
+    //测试
+    this.popUpImage.refresh("Image/1/blur_naked_1");
+  }
+
+
+
+
+  returnBtn()
+  {
+    this.onClose();
+    GameRootUI.I.showDefaultView();
+
+    //ViewManager.I.openBundlesView("GirlListPanel");
   }
 }

assets/Scripts/test/DemoManager.ts

@@ -4,6 +4,9 @@ import { DemoData } from "./DemoData";
 import {GirlDetailPanel} from "db://assets/Scripts/test/GirlDetailPanel";
 import {ChatPanel} from "db://assets/Scripts/test/ChatPanel";
 import {GirlListPanel} from "db://assets/Scripts/test/girlListPanel/GirlListPanel";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
+import Utils from "db://assets/Scripts/Main/Common/Utils";
+import {InnerMsgCode} from "db://assets/Scripts/Main/Config/InnerMsgCode";
 
 export class DemoManager {
   private static _instance: DemoManager;
@@ -20,38 +23,26 @@ export class DemoManager {
 
   demoData: DemoData;
 
-  public layoutout: ChatContentsLayout;
+
-  public detailPanel:GirlDetailPanel;
+  hideMainView()
-  public chatPanel:ChatPanel;
+  {
-  public girlListPanel:GirlListPanel;
+
+  }
 
   EnterChat(id: number) {
-    if(this.chatPanel==null)
+    ViewManager.I.openBundlesView("ChatPanel",id);
-    {
+
-      this.chatPanel = find("Canvas/ChatPanel").getComponent(ChatPanel);
-    }
-    this.chatPanel.node.active = true;
-    this.detailPanel.node.active = false;
   }
 
   EnterDetail(id: number) {
-    if(this.girlListPanel==null)
+    ViewManager.I.openBundlesView("GirlDetailPanel",id);
-    {
-      this.girlListPanel =find("Canvas/GirlListPanel").getComponent(GirlListPanel);
-    }
-    this.girlListPanel.node.active = false;
-    if(this.detailPanel==null)
-    {
-      this.detailPanel = find("Canvas/GirlDetailPanel").getComponent(GirlDetailPanel);
-    }
-    this.detailPanel.refresh(id);
-    this.detailPanel.node.active = true;
   }
 
-  public updateDialog(isPlayer: boolean, str: string) {
+  public updateDialog(isPlayer: boolean, str: string,fromPlayer:boolean = false) {
+    if(fromPlayer){this.demoData.cleanDialog()}
     this.demoData.pushDialog(isPlayer, str);
     console.log("update dialog");
-    this.layoutout.UpdateDialog(this.getDialogs());
+    Utils.sendInnerMsg(InnerMsgCode.Chat_DialogRefresh);
   }
 
   public getDialogs() {

assets/Scripts/test/GirlDetailPanel.ts

@@ -1,10 +1,12 @@
 import { _decorator, Component, Label, Node, Sprite } from "cc";
 import { DemoManager } from "./DemoManager";
 import {Character, characters} from "db://assets/Scripts/test/cfg/characters";
+import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
 const { ccclass, property } = _decorator;
 
 @ccclass("GirlDetailPanel")
-export class GirlDetailPanel extends Component {
+export class GirlDetailPanel extends li_BaseView {
   @property(Sprite)
   avatar: Sprite;
   @property(Label)
@@ -16,6 +18,12 @@ export class GirlDetailPanel extends Component {
   chatBtn: Node;
   id = 0;
 
+  openUIDataCT(data)
+  {
+    this.id = data;
+    this.refresh(this.id);
+  }
+
   refresh(index:number)
   {
     const data = characters[index-1];
@@ -25,5 +33,12 @@ export class GirlDetailPanel extends Component {
   }
   OnClickChatBtn() {
     DemoManager.getInstance().EnterChat(this.id);
+    this.onClose();
+  }
+
+  returnBtn()
+  {
+    this.onClose();
+    //ViewManager.I.openBundlesView("GirlListPanel");
   }
 }

assets/Scripts/test/ImagePopup.ts

@@ -0,0 +1,51 @@
+import { _decorator, Component, Node,Sprite,Vec3 ,tween, UITransform} from 'cc';
+import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
+import Utils from "db://assets/Scripts/Main/Common/Utils";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
+const { ccclass, property } = _decorator;
+
+@ccclass('ImagePopup')
+export class ImagePopup extends Component {
+    @property(Sprite)
+    image:Sprite;
+
+
+    start()
+    {
+        this.node.setPosition(new Vec3(-1000,493,0));
+        this.image.node.on(Node.EventType.TOUCH_START,this.openImage);
+    }
+
+    onDestroy()
+    {
+        this.image.node.off(Node.EventType.TOUCH_START,this.openImage);
+    }
+
+    refresh(path:string)
+    {
+        ResManager.I.changeBundleSpriteFrame(this.image,path,"Chat18x",()=>{
+            let sizeTran = this.image.node.parent.getComponent(UITransform);
+            Utils.adjustBgPixelRatioToSize(sizeTran.contentSize,this.image.node,2);
+            this.popUp();
+        });
+
+    }
+
+    openImage()
+    {
+        ViewManager.I.openBundlesView('ShowPanel');
+    }
+    popUp()
+    {
+        tween(this.node).to(0.5,{position:new Vec3(-559.374,493,0)},{easing:"backOut"}).start();
+        this.scheduleOnce(()=>{
+            this.popDown();
+        },5);
+    }
+    popDown()
+    {
+        tween(this.node).to(0.5,{position:new Vec3(-1000,493,0)},{easing:"backIn"}).start();
+    }
+}
+
+

assets/Scripts/test/ImagePopup.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "c0cd7ea3-c521-468b-b49c-6c04142e385d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/Scripts/test/girlListPanel/GirlListItem.ts

@@ -9,6 +9,7 @@ import {
 } from "cc";
 import { DemoManager } from "../DemoManager";
 import { Character, characters } from "db://assets/Scripts/test/cfg/characters";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
 const { ccclass, property } = _decorator;
 
 @ccclass("GirlListItem")
@@ -26,19 +27,17 @@ export class GirlListItem extends Component {
 
   id: number = -1;
 
-  protected onEnable(): void {
+  baseNode: Node;
-    this.refreshData(1);
+  refreshData(data: Character,base:Node) {
-  }
-
-  refreshData(index: number) {
-    const data = characters[index - 1];
     this.id = data.id;
     this.girlName.string = data.name;
     //this.avatar.spriteFrame =
+    this.baseNode = base;
   }
 
   onClickDetail() {
     DemoManager.getInstance().EnterDetail(this.id);
+    //ViewManager.I.closeView(this.baseNode);
   }
 
   update(deltaTime: number) {}

assets/Scripts/test/girlListPanel/GirlListPanel.ts

@@ -1,17 +1,52 @@
-import { _decorator, Component, Node } from 'cc';
+import { _decorator, Component, Node,instantiate } from 'cc';
 import {characters} from "db://assets/Scripts/test/cfg/characters";
+import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
+import Utils from "db://assets/Scripts/Main/Common/Utils";
+import {GirlListItem} from "db://assets/Scripts/test/girlListPanel/GirlListItem";
 const { ccclass, property } = _decorator;
 
 @ccclass('GirlListPanel')
-export class GirlListPanel extends Component {
+export class GirlListPanel extends li_BaseView {
-    onEnable()
+    private _nodeTab: any = {};
-    {
-        const cfg = characters;
-        for (let i = 0; i < cfg.length; i++) {
-            const c = cfg[i];
 
+    itemInst:GirlListItem;
+    content:Node;
+
+    cache:GirlListItem[] = [];
+    onLoadCT() {
+        Utils.parseNode(this.node,this._nodeTab);
+        this.registerListener();
+        this.itemInst = this._nodeTab.BubbleItem.getComponent(GirlListItem);
+        this.itemInst.node.active = false;
+        this.content = this._nodeTab.content;
+        this.show();
+    }
+
+
+    show()
+    {
+        if(this.cache)
+        {
+            for(let i = this.cache.length-1; i >=0; i--)
+            {
+                this.cache[i].node.destroy();
+            }
+        }
+        const config = characters;
+        for (let i = 0; i < config.length; i++) {
+            const cfg = config[i];
+            let newNode = instantiate(this.itemInst.node)
+            let item = newNode.getComponent(GirlListItem);
+            item.refreshData(cfg,this.node);
+            newNode.active = true;
+            this.cache.push(item);
+            this.content.addChild(newNode);
         }
     }
+
+
+
+    private registerListener() {}
 }
 
 

assets/Scripts/test/girlListPanel/ShowPanel.ts

@@ -0,0 +1,36 @@
+import { _decorator, Component, Node,Sprite ,UITransform} from 'cc';
+import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView";
+import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
+import Utils from "db://assets/Scripts/Main/Common/Utils";
+import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
+import {GButton} from "db://assets/Scripts/Main/Common/GButton";
+const { ccclass, property } = _decorator;
+
+@ccclass('ShowPanel')
+export class ShowPanel extends li_BaseView {
+    @property(Sprite)
+    image:Sprite;
+    @property(Sprite)
+    splash:Sprite;
+
+    onLoadCT() {
+        this.show("Image/1/naked_1");
+
+    }
+
+    start()
+    {
+        //this.splash.node.on(Node.EventType.TOUCH_START,this.onclickback);
+        GButton.BandClick(this.splash.node,()=>{this.close()},this);
+    }
+
+
+    show(path:string)
+    {
+        ResManager.I.changeBundleSpriteFrame(this.image,path,"Chat18x",()=>{
+            Utils.adjustBgPixelRatio(this.image.node,3);
+        });
+    }
+}
+
+

assets/Scripts/test/girlListPanel/ShowPanel.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b7645da0-3b81-454b-8956-068491ce4706",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundles/Chat18x.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "60dd6f50-9766-4529-ad5a-7d840682df83",
+  "files": [],
+  "subMetas": {},
+  "userData": {
+    "isBundle": true
+  }
+}

assets/bundles/Chat18x/GirlDetailPanel.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "7eefc3e4-06e0-4368-a22d-5bade2fa5c7f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "GirlDetailPanel"
+  }
+}

assets/bundles/Chat18x/GirlListPanel.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "4f9c80cb-95ce-46a5-b6b4-4edc1df50faa",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "GirlListPanel"
+  }
+}

assets/bundles/Chat18x/Image/1.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "06eb8ab2-9d64-4f5e-a03b-c3f89459f54c",
+  "uuid": "78d64637-d169-403f-8c46-b7d968525e51",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/bundles/Chat18x/Image/1/blur_naked_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "a607644d-08ae-4bd1-b897-5954221e6e32",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "a607644d-08ae-4bd1-b897-5954221e6e32@6c48a",
+      "displayName": "blur_naked_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "a607644d-08ae-4bd1-b897-5954221e6e32",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "a607644d-08ae-4bd1-b897-5954221e6e32@f9941",
+      "displayName": "blur_naked_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 960,
+        "height": 1664,
+        "rawWidth": 960,
+        "rawHeight": 1664,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -480,
+            -832,
+            0,
+            480,
+            -832,
+            0,
+            -480,
+            832,
+            0,
+            480,
+            832,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1664,
+            960,
+            1664,
+            0,
+            0,
+            960,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -480,
+            -832,
+            0
+          ],
+          "maxPos": [
+            480,
+            832,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "a607644d-08ae-4bd1-b897-5954221e6e32@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "a607644d-08ae-4bd1-b897-5954221e6e32@6c48a"
+  }
+}

assets/bundles/Chat18x/Image/1/naked_1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d6b3a411-98f5-42ca-993e-9eed74d75a81",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d6b3a411-98f5-42ca-993e-9eed74d75a81@6c48a",
+      "displayName": "naked_1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "d6b3a411-98f5-42ca-993e-9eed74d75a81",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "d6b3a411-98f5-42ca-993e-9eed74d75a81@f9941",
+      "displayName": "naked_1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 960,
+        "height": 1664,
+        "rawWidth": 960,
+        "rawHeight": 1664,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -480,
+            -832,
+            0,
+            480,
+            -832,
+            0,
+            -480,
+            832,
+            0,
+            480,
+            832,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1664,
+            960,
+            1664,
+            0,
+            0,
+            960,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -480,
+            -832,
+            0
+          ],
+          "maxPos": [
+            480,
+            832,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d6b3a411-98f5-42ca-993e-9eed74d75a81@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "d6b3a411-98f5-42ca-993e-9eed74d75a81@6c48a"
+  }
+}

assets/bundles/Chat18x/ShowPanel.prefab

@@ -0,0 +1,540 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "ShowPanel",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ShowPanel",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_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.Node",
+    "_name": "SpriteSplash",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 11
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1170,
+      "height": 2532
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 138
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_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__": 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",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "847WtxRnVLRZqyVBgRKHkS",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Sprite",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_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__": 12
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1170,
+      "height": 2532
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "beY70tNSxAU5O17HlbAznA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "024ZZI5b5NhpdRlh6i2eLp"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "52jgqQ9vlBQYgXgdtSXSdN",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1170,
+      "height": 2532
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "23B0dWovFBgKVDvqUYR77D"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_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": "cd1+ED5FxIYpcAIWPNDCw7"
+  },
+  {
+    "__type__": "b76452gO4FFS4lWBoSRzkcG",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "m_rootNode": null,
+    "image": {
+      "__id__": 15
+    },
+    "splash": {
+      "__id__": 5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bdxGnD37hASKBbbGc1wnrj"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "18xipwdnNNI6CKhTGcIHEq",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/bundles/Chat18x/ShowPanel.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "9f15a6a9-4a28-4fa0-87fc-2d905449c64a",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "ShowPanel"
+  }
+}

assets/bundles/DataTable/commonGlobal.json

@@ -1,2 +1,4 @@
-[{"id":1,"type":0,"value":8,"para":""},
+[
-{"id":100,"type":0,"value":10,"para":""}]
+  { "id": 1, "type": 0, "value": 8, "para": "" },
+  { "id": 100, "type": 0, "value": 10, "para": "" }
+]

assets/bundles/DataTable/levelHole.json

@@ -1 +0,0 @@
-[{"id":1,"clrNum":"2|3,4|3,5|3","boxSeq":"2|4|5"}]

assets/bundles/DataTable/levelHole.json.meta

@@ -1,11 +0,0 @@
-{
-  "ver": "2.0.1",
-  "importer": "json",
-  "imported": true,
-  "uuid": "28a709aa-d32b-4924-a522-2e1773a526af",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

assets/cfg/~$en.xlsx.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "*",
-  "imported": true,
-  "uuid": "77a7f2c7-b92c-4bd7-888d-5dfe9b470b3c",
-  "files": [
-    ".json",
-    ".xlsx"
-  ],
-  "subMetas": {},
-  "userData": {}
-}