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

assets/bundles/Chat18x/ChatPanel.prefab

@@ -332,7 +332,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 607.8499999999999,
+      "y": 1110.85,
       "z": 0
     },
     "_lrot": {
@@ -425,7 +425,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
       "height": 1052.7819999999997
     },
     "_anchorPoint": {
@@ -562,7 +562,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -355,
+      "x": -520,
       "y": -44.85,
       "z": 0
     },
@@ -1014,7 +1014,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 259.971,
+      "x": 424.971,
       "y": -53.26599999999985,
       "z": 0
     },
@@ -1386,7 +1386,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 259.971,
+      "x": 424.971,
       "y": -53.26599999999985,
       "z": 0
     },
@@ -1564,7 +1564,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -272.315,
+      "x": -437.315,
       "y": -44.84999999999991,
       "z": 0
     },
@@ -1799,7 +1799,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
       "height": 118.3
     },
     "_anchorPoint": {
@@ -2129,8 +2129,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 322.977,
+      "x": 487.977,
-      "y": -459.3929999999999,
+      "y": -962.393,
       "z": 0
     },
     "_lrot": {
@@ -2247,8 +2247,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1012.5999999999998
+      "height": 2018.6
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2451,7 +2451,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -325,
+      "x": -490,
       "y": -416.69299999999987,
       "z": 0
     },
@@ -3166,7 +3166,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 325,
+      "x": 490,
       "y": -420.4179999999999,
       "z": 0
     },
@@ -3899,8 +3899,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1009.5999999999998
+      "height": 2015.6
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3999,7 +3999,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -566.9999999999999,
+      "y": -1070,
       "z": 0
     },
     "_lrot": {
@@ -4247,7 +4247,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -296.95,
+      "x": -461.95,
       "y": 47,
       "z": 0
     },
@@ -4288,7 +4288,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 595.9,
+      "width": 925.9,
       "height": 94
     },
     "_anchorPoint": {
@@ -4409,7 +4409,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -296.95,
+      "x": -461.95,
       "y": 47,
       "z": 0
     },
@@ -4450,7 +4450,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 595.9,
+      "width": 925.9,
       "height": 94
     },
     "_anchorPoint": {
@@ -4580,7 +4580,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 597.9,
+      "width": 927.9,
       "height": 94
     },
     "_anchorPoint": {
@@ -5140,7 +5140,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
       "height": 200
     },
     "_anchorPoint": {
@@ -5267,7 +5267,7 @@
         "__id__": 267
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 298
@@ -7063,8 +7063,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1333.9999999999998
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7837,8 +7837,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1333.9999999999998
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

settings/v2/packages/project.json

@@ -2,8 +2,8 @@
   "__version__": "1.0.6",
   "general": {
     "designResolution": {
-      "width": 750,
+      "width": 1080,
-      "height": 1334,
+      "height": 2340,
       "fitHeight": false,
       "fitWidth": true
     }