Merge branch 'main' of http://chengchennet.cn:3000/mushroom/squidGame

tgx-games-client/assets/module_arean/common/bg/加载图1.jpg.meta

@@ -46,12 +46,12 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1242,
+        "width": 750,
-        "height": 2208,
+        "height": 1440,
-        "rawWidth": 1242,
+        "rawWidth": 750,
-        "rawHeight": 2208,
+        "rawHeight": 1440,
-        "borderTop": 0,
+        "borderTop": 371,
-        "borderBottom": 0,
+        "borderBottom": 428,
         "borderLeft": 0,
         "borderRight": 0,
         "packable": true,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0,
-            621,
+            375,
-            -1104,
+            -720,
             0,
-            -621,
+            -375,
-            1104,
+            720,
             0,
-            621,
+            375,
-            1104,
+            720,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            2208,
+            1440,
-            1242,
+            750,
-            2208,
+            1440,
             0,
             0,
-            1242,
+            750,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0
           ],
           "maxPos": [
-            621,
+            375,
-            1104,
+            720,
             0
           ]
         },

tgx-games-client/assets/module_arean/common/bg/加载图2.jpg.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1242,
+        "width": 750,
-        "height": 2208,
+        "height": 1440,
-        "rawWidth": 1242,
+        "rawWidth": 750,
-        "rawHeight": 2208,
+        "rawHeight": 1440,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0,
-            621,
+            375,
-            -1104,
+            -720,
             0,
-            -621,
+            -375,
-            1104,
+            720,
             0,
-            621,
+            375,
-            1104,
+            720,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            2208,
+            1440,
-            1242,
+            750,
-            2208,
+            1440,
             0,
             0,
-            1242,
+            750,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0
           ],
           "maxPos": [
-            621,
+            375,
-            1104,
+            720,
             0
           ]
         },

tgx-games-client/assets/module_arean/common/bg/加载图3.jpg.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 1242,
+        "width": 750,
-        "height": 2208,
+        "height": 1440,
-        "rawWidth": 1242,
+        "rawWidth": 750,
-        "rawHeight": 2208,
+        "rawHeight": 1440,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0,
-            621,
+            375,
-            -1104,
+            -720,
             0,
-            -621,
+            -375,
-            1104,
+            720,
             0,
-            621,
+            375,
-            1104,
+            720,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            2208,
+            1440,
-            1242,
+            750,
-            2208,
+            1440,
             0,
             0,
-            1242,
+            750,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -621,
+            -375,
-            -1104,
+            -720,
             0
           ],
           "maxPos": [
-            621,
+            375,
-            1104,
+            720,
             0
           ]
         },

tgx-games-client/assets/module_arean/scripts/common.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "b75d291b-9a21-4b77-b318-29cc394dc9a7",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts

@@ -0,0 +1,15 @@
+// CameraOrbit.ts
+import { _decorator, Component, Node, Vec3, tween } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('CameraOrbit')
+export class CameraOrbit extends Component {
+    start() {
+        tween(this.node)
+            .repeatForever(
+                tween()
+                    .to(360, { eulerAngles: new Vec3(0, 360, 0) })
+            )
+            .start();
+    }
+}

tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "9f069a5c-fe78-4edf-ad57-9b64c9ca5a1b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

tgx-games-client/assets/module_basic/scene_login/login.scene

@@ -152,7 +152,7 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 375,
+      "x": 375.00000000000006,
       "y": 720,
       "z": 0
     },
@@ -238,7 +238,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 890.2828467153284,
+    "_orthoHeight": 720,
     "_near": 1,
     "_far": 2000,
     "_color": {
@@ -336,7 +336,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 750.0000000000001,
       "height": 1440
     },
     "_anchorPoint": {
@@ -367,7 +367,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "260d026d-014b-4549-b395-7cb73b7343bb@f9941",
+      "__uuid__": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -437,7 +437,7 @@
       "__id__": 4
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 13
@@ -582,7 +582,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 750.0000000000001,
       "height": 1440
     },
     "_anchorPoint": {

tgx-games-client/assets/module_basic/ui_waiting/UI_Waiting.prefab

@@ -149,7 +149,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750.0000000000001,
-      "height": 1440.0000000000002
+      "height": 1440
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -252,8 +252,6 @@
       "__id__": 0
     },
     "fileId": "bdlix+gOFH15utKrV6K7Di",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -824,7 +822,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750.0000000000001,
-      "height": 1440.0000000000002
+      "height": 1440
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -860,7 +858,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "260d026d-014b-4549-b395-7cb73b7343bb@f9941",
+      "__uuid__": "798e07bc-4a9d-40bb-ad75-107caf130115@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1680,7 +1678,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "正在擦亮武器..",
+    "_string": "都准备好了么..",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 24,
@@ -1757,7 +1755,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750.0000000000001,
-      "height": 1440.0000000000002
+      "height": 1440
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1834,7 +1832,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750.0000000000001,
-      "height": 1440.0000000000002
+      "height": 1440
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

tgx-games-client/assets/start/homeBg.jpg.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "79a33ee6-ba55-4382-a18f-1a99a227d1ff",
+  "files": [
+    ".jpg",
+    ".json"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a",
+      "displayName": "homeBg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "79a33ee6-ba55-4382-a18f-1a99a227d1ff",
+        "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": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@f9941",
+      "displayName": "homeBg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 750,
+        "height": 1393,
+        "rawWidth": 750,
+        "rawHeight": 1393,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -375,
+            -696.5,
+            0,
+            375,
+            -696.5,
+            0,
+            -375,
+            696.5,
+            0,
+            375,
+            696.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1393,
+            750,
+            1393,
+            0,
+            0,
+            750,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -375,
+            -696.5,
+            0
+          ],
+          "maxPos": [
+            375,
+            696.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": false,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a"
+  }
+}

tgx-games-client/settings/v2/packages/project.json

@@ -22,5 +22,6 @@
       "1": 5,
       "2": 7
     }
-  }
+  },
+  "custom_joint_texture_layouts": []
 }