Merge branch 'master' of http://gitlab2.dui88.com/sparkprojects/mingsnake_241120

64a5c744 · spc · 94807bfa · a62adf0b · 64a5c744 · 64a5c744
Commit 64a5c744 authored Dec 12, 2024 by spc
37 changed files
--- a/assets/Bundles/FirstSkinPanel.meta
+++ b/assets/Bundles/FirstSkinPanel.meta
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"d2c3097f-6b1e-4552-8d0f-399dd4fb4cf0","files":[],"subMetas":{},"userData":{"isBundle":true}}
--- a/assets/Bundles/FirstSkinPanel/FirstSkinPanel.prefab
+++ b/assets/Bundles/FirstSkinPanel/FirstSkinPanel.prefab
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "FirstSkinPanel",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "FirstSkinPanel",
+    "_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": "sign_btn",
+    "_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": -301,
+      "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": 300,
+      "height": 88
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cfpXMrMYFEn473jsaXzS1t"
+  },
+  {
+    "__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": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "25067c00-c3b2-494f-9e1a-430164de3c0c@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_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": "7cbVxDRaRJkpxSaHgFBSR4"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_alignFlags": 20,
+    "_target": null,
+    "_left": 0,
+    "_right": 70,
+    "_top": 0,
+    "_bottom": 30,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "dchpjh2MpENZ7PbFg1I7gt"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_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.05,
+    "_zoomScale": 0.9,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b75ZTSIH5O46aAMcQuXusx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "86iht1MK9NTaRXLTHggLrU",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "signBg",
+    "_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": 1624,
+      "height": 455
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f6cz8dQ+9M7bd5hvBy3Ygu"
+  },
+  {
+    "__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": {
+      "__uuid__": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_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": "85apVDjKBE3aSPJSaWciIn"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c01bmg6UFO9qXRsjShgdsx",
+    "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": 1624,
+      "height": 750
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fliGvajRKV6ElSFhgBe05"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_alignFlags": 18,
+    "_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": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7f8HEEOJBNGoLpGt2Yuf+q"
+  },
+  {
+    "__type__": "52c80SEFPBJBbevjyHnShfx",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "closeBtn": {
+      "__id__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4bXhnL8hhI4JZsobF0BMI8"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
--- a/assets/Bundles/FirstSkinPanel/FirstSkinPanel.prefab.meta
+++ b/assets/Bundles/FirstSkinPanel/FirstSkinPanel.prefab.meta
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "425bc58a-66e2-4e59-8ef5-ef3cf29c6932",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "FirstSkinPanel"
+  }
+}
--- a/assets/Bundles/FirstSkinPanel/png.meta
+++ b/assets/Bundles/FirstSkinPanel/png.meta
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"c13a8151-e0e2-4c33-8e6d-807058d7b8d4","files":[],"subMetas":{},"userData":{}}
--- a/assets/Bundles/FirstSkinPanel/png/bg.png
+++ b/assets/Bundles/FirstSkinPanel/png/bg.png
--- a/assets/Bundles/HomeScene/png/share_text.png.meta
+++ b/assets/Bundles/HomeScene/png/share_text.png.meta
@@ -2,7 +2,7 @@
  "ver": "1.0.27",
  "importer": "image",
  "imported": true,
-  "uuid": "9b70c17f-a5b6-4649-86ba-4e56503293a0",
+  "uuid": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1",
  "files": [
    ".json",
    ".png"
@@ -10,14 +10,14 @@
  "subMetas": {
    "6c48a": {
      "importer": "texture",
-      "uuid": "9b70c17f-a5b6-4649-86ba-4e56503293a0@6c48a",
+      "uuid": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1@6c48a",
-      "displayName": "share_text",
+      "displayName": "bg",
      "id": "6c48a",
      "name": "texture",
      "userData": {
        "wrapModeS": "clamp-to-edge",
        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9b70c17f-a5b6-4649-86ba-4e56503293a0",
+        "imageUuidOrDatabaseUri": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1",
        "isUuid": true,
        "visible": false,
        "minfilter": "linear",
@@ -34,8 +34,8 @@
    },
    "f9941": {
      "importer": "sprite-frame",
-      "uuid": "9b70c17f-a5b6-4649-86ba-4e56503293a0@f9941",
+      "uuid": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1@f9941",
-      "displayName": "share_text",
+      "displayName": "bg",
      "id": "f9941",
      "name": "spriteFrame",
      "userData": {
@@ -46,14 +46,14 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 122,
+        "width": 1624,
-        "height": 53,
+        "height": 455,
-        "rawWidth": 122,
+        "rawWidth": 1624,
-        "rawHeight": 53,
+        "rawHeight": 455,
-        "borderTop": 23,
+        "borderTop": 0,
-        "borderBottom": 21,
+        "borderBottom": 0,
-        "borderLeft": 61,
+        "borderLeft": 0,
-        "borderRight": 61,
+        "borderRight": 0,
        "packable": true,
        "pixelsToUnit": 100,
        "pivotX": 0.5,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -61,
+            -812,
-            -26.5,
+            -227.5,
            0,
-            61,
+            812,
-            -26.5,
+            -227.5,
            0,
-            -61,
+            -812,
-            26.5,
+            227.5,
            0,
-            61,
+            812,
-            26.5,
+            227.5,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            53,
+            455,
-            122,
+            1624,
-            53,
+            455,
            0,
            0,
-            122,
+            1624,
            0
          ],
          "nuv": [
@@ -103,18 +103,18 @@
            1
          ],
          "minPos": [
-            -61,
+            -812,
-            -26.5,
+            -227.5,
            0
          ],
          "maxPos": [
-            61,
+            812,
-            26.5,
+            227.5,
            0
          ]
        },
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9b70c17f-a5b6-4649-86ba-4e56503293a0@6c48a",
+        "imageUuidOrDatabaseUri": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1@6c48a",
        "atlasUuid": ""
      },
      "ver": "1.0.12",
@@ -129,6 +129,6 @@
    "type": "sprite-frame",
    "hasAlpha": true,
    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9b70c17f-a5b6-4649-86ba-4e56503293a0@6c48a"
+    "redirect": "12ff64d0-ce7f-45d6-bde8-ce6ce253ede1@6c48a"
  }
 }
--- a/assets/Bundles/GetPrize/GetPrize.prefab
+++ b/assets/Bundles/GetPrize/GetPrize.prefab
@@ -261,7 +261,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "04I8movZRGh6it4HdZK1pz"
+    "fileId": "b8j/M4QFJDELCrDUeDfwL/"
  },
  {
    "__type__": "cc.Sprite",
@@ -303,7 +303,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "54zfr8gEFFqIGzHDHuOZOv"
+    "fileId": "06QFa/c+xFeYqmFnS8/xBd"
  },
  {
    "__type__": "cc.PrefabInfo",
@@ -313,7 +313,7 @@
    "asset": {
      "__id__": 0
    },
-    "fileId": "c2wbIoZDpPQ6wEtGhKXe/Y",
+    "fileId": "53B96vSvpHOZePWLxubhBQ",
    "instance": null,
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
@@ -394,7 +394,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bb5sfZQpBOFrc3nMQn14Qk"
+    "fileId": "26C5yiDAlCIpFxqeTXrQRE"
  },
  {
    "__type__": "cc.Sprite",
@@ -436,7 +436,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9aG3DRxaRJ/4eox648dQMw"
+    "fileId": "ea1dnYyYFAHJ1s45D+xK/S"
  },
  {
    "__type__": "cc.PrefabInfo",
@@ -446,7 +446,7 @@
    "asset": {
      "__id__": 0
    },
-    "fileId": "c479oPyi5HzZRBRrOmLcir",
+    "fileId": "f3sHPwmZdL35SbnLpYV8ku",
    "instance": null,
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
@@ -527,7 +527,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4ejjbbgQdLL7jUIuY06yOL"
+    "fileId": "e5aMgALaZNCIDJX6Ma8jYu"
  },
  {
    "__type__": "cc.Sprite",
@@ -569,7 +569,7 @@
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a5coQFfaVI1pWBSmPWokHj"
+    "fileId": "a7gAvMNUpAA5722fGoPEYI"
  },
  {
    "__type__": "cc.PrefabInfo",
@@ -579,7 +579,7 @@
    "asset": {
      "__id__": 0
    },
-    "fileId": "e5NKXwjkdCXoIxPe8qkE5x",
+    "fileId": "69Ym47YbhCJaqQBfpPb4yb",
    "instance": null,
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
@@ -1110,7 +1110,7 @@
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 0,
+      "y": -5.684341886080802e-14,
      "z": 0
    },
    "_lrot": {
@@ -1180,8 +1180,8 @@
    "_target": null,
    "_left": 16.015625,
    "_right": 515,
-    "_top": 90,
+    "_top": 90.00000000000006,
-    "_bottom": 90,
+    "_bottom": 89.99999999999994,
    "_horizontalCenter": 0,
    "_verticalCenter": 0,
    "_isAbsLeft": true,
@@ -1193,7 +1193,7 @@
    "_originalWidth": 800,
    "_originalHeight": 400,
    "_alignMode": 2,
-    "_lockFlags": 0,
+    "_lockFlags": 16,
    "_id": ""
  },
  {

--- a/assets/Bundles/GetPrize/prize.prefab
+++ b/assets/Bundles/GetPrize/prize.prefab
@@ -131,7 +131,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 200,
-      "height": 50.4
+      "height": 55
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -168,11 +168,11 @@
    },
    "_string": "1111",
    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
+    "_verticalAlign": 0,
    "_actualFontSize": 28,
    "_fontSize": 28,
    "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 26,
    "_overflow": 1,
    "_enableWrapText": true,
    "_font": null,

--- a/assets/Bundles/HomeScene/HomeScene.scene
+++ b/assets/Bundles/HomeScene/HomeScene.scene
--- a/assets/Bundles/HomeScene/png/fudai_btn.png
+++ b/assets/Bundles/HomeScene/png/fudai_btn.png
--- a/assets/Bundles/HomeScene/png/fudai_btn.png.meta
+++ b/assets/Bundles/HomeScene/png/fudai_btn.png.meta
@@ -2,7 +2,7 @@
  "ver": "1.0.27",
  "importer": "image",
  "imported": true,
-  "uuid": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1",
+  "uuid": "ff404010-daa7-4293-9223-0a9d7d5690f9",
  "files": [
    ".json",
    ".png"
@@ -10,14 +10,14 @@
  "subMetas": {
    "6c48a": {
      "importer": "texture",
-      "uuid": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1@6c48a",
+      "uuid": "ff404010-daa7-4293-9223-0a9d7d5690f9@6c48a",
      "displayName": "fudai_btn",
      "id": "6c48a",
      "name": "texture",
      "userData": {
        "wrapModeS": "clamp-to-edge",
        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1",
+        "imageUuidOrDatabaseUri": "ff404010-daa7-4293-9223-0a9d7d5690f9",
        "isUuid": true,
        "visible": false,
        "minfilter": "linear",
@@ -34,7 +34,7 @@
    },
    "f9941": {
      "importer": "sprite-frame",
-      "uuid": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1@f9941",
+      "uuid": "ff404010-daa7-4293-9223-0a9d7d5690f9@f9941",
      "displayName": "fudai_btn",
      "id": "f9941",
      "name": "spriteFrame",
@@ -114,7 +114,7 @@
          ]
        },
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1@6c48a",
+        "imageUuidOrDatabaseUri": "ff404010-daa7-4293-9223-0a9d7d5690f9@6c48a",
        "atlasUuid": ""
      },
      "ver": "1.0.12",
@@ -129,6 +129,6 @@
    "type": "sprite-frame",
    "hasAlpha": true,
    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "686aa248-bd43-4aa4-b2fb-ec8a8efb96c1@6c48a"
+    "redirect": "ff404010-daa7-4293-9223-0a9d7d5690f9@6c48a"
  }
 }
--- a/assets/Bundles/HomeScene/png/share_text.png
+++ b/assets/Bundles/HomeScene/png/share_text.png
--- a/assets/Bundles/HomeScene/png/白色三角.png
+++ b/assets/Bundles/HomeScene/png/白色三角.png
--- a/assets/Bundles/HomeScene/png/白色三角.png.meta
+++ b/assets/Bundles/HomeScene/png/白色三角.png.meta
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "498f2fe4-81e2-4b20-9612-def99c026b22",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "498f2fe4-81e2-4b20-9612-def99c026b22@6c48a",
+      "displayName": "白色三角",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "498f2fe4-81e2-4b20-9612-def99c026b22",
+        "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": "498f2fe4-81e2-4b20-9612-def99c026b22@f9941",
+      "displayName": "白色三角",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 22,
+        "height": 15,
+        "rawWidth": 22,
+        "rawHeight": 15,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -11,
+            -7.5,
+            0,
+            11,
+            -7.5,
+            0,
+            -11,
+            7.5,
+            0,
+            11,
+            7.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            15,
+            22,
+            15,
+            0,
+            0,
+            22,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -11,
+            -7.5,
+            0
+          ],
+          "maxPos": [
+            11,
+            7.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "498f2fe4-81e2-4b20-9612-def99c026b22@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "498f2fe4-81e2-4b20-9612-def99c026b22@6c48a"
+  }
+}
--- a/assets/Bundles/HomeScene/png/白色气泡.png
+++ b/assets/Bundles/HomeScene/png/白色气泡.png
--- a/assets/Bundles/HomeScene/png/白色气泡.png.meta
+++ b/assets/Bundles/HomeScene/png/白色气泡.png.meta
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "65342ea4-fd91-4c0a-a756-58764e040db1",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "65342ea4-fd91-4c0a-a756-58764e040db1@6c48a",
+      "displayName": "白色气泡",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "65342ea4-fd91-4c0a-a756-58764e040db1",
+        "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": "65342ea4-fd91-4c0a-a756-58764e040db1@f9941",
+      "displayName": "白色气泡",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 184,
+        "height": 78,
+        "rawWidth": 184,
+        "rawHeight": 78,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -92,
+            -39,
+            0,
+            92,
+            -39,
+            0,
+            -92,
+            39,
+            0,
+            92,
+            39,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            78,
+            184,
+            78,
+            0,
+            0,
+            184,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -92,
+            -39,
+            0
+          ],
+          "maxPos": [
+            92,
+            39,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "65342ea4-fd91-4c0a-a756-58764e040db1@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "65342ea4-fd91-4c0a-a756-58764e040db1@6c48a"
+  }
+}
--- a/assets/Bundles/HomeScene/png/黑色三角.png
+++ b/assets/Bundles/HomeScene/png/黑色三角.png
--- a/assets/Bundles/HomeScene/png/黑色三角.png.meta
+++ b/assets/Bundles/HomeScene/png/黑色三角.png.meta
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5fe5690d-73e2-4a70-a720-cf1901ac236e",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5fe5690d-73e2-4a70-a720-cf1901ac236e@6c48a",
+      "displayName": "黑色三角",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5fe5690d-73e2-4a70-a720-cf1901ac236e",
+        "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": "5fe5690d-73e2-4a70-a720-cf1901ac236e@f9941",
+      "displayName": "黑色三角",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 16,
+        "height": 11,
+        "rawWidth": 16,
+        "rawHeight": 11,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -8,
+            -5.5,
+            0,
+            8,
+            -5.5,
+            0,
+            -8,
+            5.5,
+            0,
+            8,
+            5.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            11,
+            16,
+            11,
+            0,
+            0,
+            16,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -8,
+            -5.5,
+            0
+          ],
+          "maxPos": [
+            8,
+            5.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5fe5690d-73e2-4a70-a720-cf1901ac236e@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5fe5690d-73e2-4a70-a720-cf1901ac236e@6c48a"
+  }
+}
--- a/assets/Bundles/HomeScene/png/黑色气泡.png
+++ b/assets/Bundles/HomeScene/png/黑色气泡.png
--- a/assets/Bundles/HomeScene/png/黑色气泡.png.meta
+++ b/assets/Bundles/HomeScene/png/黑色气泡.png.meta
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad@6c48a",
+      "displayName": "黑色气泡",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad",
+        "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": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad@f9941",
+      "displayName": "黑色气泡",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 216,
+        "height": 44,
+        "rawWidth": 216,
+        "rawHeight": 44,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -108,
+            -22,
+            0,
+            108,
+            -22,
+            0,
+            -108,
+            22,
+            0,
+            108,
+            22,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            44,
+            216,
+            44,
+            0,
+            0,
+            216,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -108,
+            -22,
+            0
+          ],
+          "maxPos": [
+            108,
+            22,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5e83c9e4-d4d9-417c-8f5e-b02f70ef26ad@6c48a"
+  }
+}
--- a/assets/Bundles/MyBagPanel/MyBagPanel.prefab
+++ b/assets/Bundles/MyBagPanel/MyBagPanel.prefab
@@ -25,17 +25,17 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 100
+        "__id__": 108
      },
      {
-        "__id__": 102
+        "__id__": 110
      },
      {
-        "__id__": 104
+        "__id__": 112
      }
    ],
    "_prefab": {
-      "__id__": 106
+      "__id__": 114
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -88,20 +88,20 @@
        "__id__": 65
      },
      {
-        "__id__": 80
+        "__id__": 88
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 95
+        "__id__": 103
      },
      {
-        "__id__": 97
+        "__id__": 105
      }
    ],
    "_prefab": {
-      "__id__": 99
+      "__id__": 107
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1638,19 +1638,22 @@
    "_children": [
      {
        "__id__": 66
+      },
+      {
+        "__id__": 75
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 75
+        "__id__": 83
      },
      {
-        "__id__": 77
+        "__id__": 85
      }
    ],
    "_prefab": {
-      "__id__": 79
+      "__id__": 87
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1850,6 +1853,204 @@
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
+  {
+    "__type__": "cc.Node",
+    "_name": "暂无数据",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 65
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 76
+      },
+      {
+        "__id__": 78
+      },
+      {
+        "__id__": 80
+      }
+    ],
+    "_prefab": {
+      "__id__": 82
+    },
+    "_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__": 75
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 77
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6f1u2maj1JIbTrm8FhLn2W"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 75
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 79
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "暂无数据",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1fs8yb8T9F0pmvqtQk6EG3"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 75
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 81
+    },
+    "_alignFlags": 18,
+    "_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": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2dE/Vo/85BdZKZ285drGhs"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5eu/gu+e9NAJdn96mMd7AH",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
  {
    "__type__": "cc.UITransform",
    "_name": "",
@@ -1860,7 +2061,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 76
+      "__id__": 84
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1888,7 +2089,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 78
+      "__id__": 86
    },
    "_alignFlags": 20,
    "_target": null,
@@ -1937,20 +2138,20 @@
    },
    "_children": [
      {
-        "__id__": 81
+        "__id__": 89
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 90
+        "__id__": 98
      },
      {
-        "__id__": 92
+        "__id__": 100
      }
    ],
    "_prefab": {
-      "__id__": 94
+      "__id__": 102
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1987,23 +2188,23 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 80
+      "__id__": 88
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 82
+        "__id__": 90
      },
      {
-        "__id__": 84
+        "__id__": 92
      },
      {
-        "__id__": 86
+        "__id__": 94
      }
    ],
    "_prefab": {
-      "__id__": 89
+      "__id__": 97
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2040,11 +2241,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 81
+      "__id__": 89
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 83
+      "__id__": 91
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2068,11 +2269,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 81
+      "__id__": 89
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 85
+      "__id__": 93
    },
    "_alignFlags": 20,
    "_target": null,
@@ -2104,11 +2305,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 81
+      "__id__": 89
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 87
+      "__id__": 95
    },
    "mask": true,
    "scrollEnabled": true,
@@ -2119,7 +2320,7 @@
    "recycleInterval": 1,
    "registerCellForEditor": [
      {
-        "__id__": 88
+        "__id__": 96
      }
    ],
    "_id": ""
@@ -2156,11 +2357,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 88
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 91
+      "__id__": 99
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2184,11 +2385,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 88
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 93
+      "__id__": 101
    },
    "_alignFlags": 20,
    "_target": null,
@@ -2237,7 +2438,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 96
+      "__id__": 104
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2265,7 +2466,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 98
+      "__id__": 106
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2323,7 +2524,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 101
+      "__id__": 109
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2351,7 +2552,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 103
+      "__id__": 111
    },
    "_alignFlags": 18,
    "_target": null,
@@ -2387,7 +2588,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 105
+      "__id__": 113
    },
    "closeBtn": {
      "__id__": 3
@@ -2396,7 +2597,7 @@
      "__id__": 65
    },
    "Tool": {
-      "__id__": 80
+      "__id__": 88
    },
    "prize_yes": {
      "__id__": 44
@@ -2411,7 +2612,10 @@
      "__id__": 32
    },
    "Prize_List": {
-      "__id__": 86
+      "__id__": 94
+    },
+    "None_list": {
+      "__id__": 75
    },
    "Tool_List": {
      "__id__": 71

--- a/assets/Scripts/Panels/FirstSkinPanel.ts
+++ b/assets/Scripts/Panels/FirstSkinPanel.ts
+import Panel from "../../Module/Panel";
+import { _decorator, Button, Label, Node, Sprite, } from "cc";
+import store from "../store/store";
+import { observer, render } from "../store/decorators";
+const { ccclass, property } = _decorator;
+@observer
+@ccclass('FirstSkinPanel')
+export default class FirstSkinPanel extends Panel {
+  static bundle = "FirstSkinPanel";
+  static skin = "FirstSkinPanel";
+  @property(Node) closeBtn: Node = null;
+  onLoad() {
+    this.closeBtn.on(Button.EventType.CLICK, this.clickClose);
+  }
+  async start() {
+  }
+  clickClose = () => {
+    this.hidePanel();
+  }
+}
--- a/assets/Scripts/Panels/FirstSkinPanel.ts.meta
+++ b/assets/Scripts/Panels/FirstSkinPanel.ts.meta
+{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"52c80484-14f0-4905-b7af-8f21e74a17f1","files":[],"subMetas":{},"userData":{}}
--- a/assets/Scripts/Panels/GetPrize.ts
+++ b/assets/Scripts/Panels/GetPrize.ts
@@ -37,13 +37,18 @@ export default class GetPrize extends Panel {
    async start() {
        const {data = this.data} = this.data
-        console.log(data, 112233)
+        console.log(data)
-        console.log(data.prizeName, 22222)
        data.map((item, index) => {
            const prize = instantiate(this.prizePrefab)
            this.content.addChild(prize)
+            const newY = this.content.position.y;
+            this.content.position
            const prizeName = prize.getChildByName("Label")
            prizeName.getComponent(Label).string = item.prizeName
            prize.getComponent(Sprite).spriteFrame = item.prizeImg

--- a/assets/Scripts/Panels/MyBagPanel.ts
+++ b/assets/Scripts/Panels/MyBagPanel.ts
@@ -32,6 +32,7 @@ export class MyBagPanel extends Panel {
  @property(Node) tool_btn: Node = null;
  @property(YXCollectionView) Prize_List: YXCollectionView = null;
+  @property(Node) None_list: Node = null;
  @property(YXCollectionView) Tool_List: YXCollectionView = null;
@@ -134,6 +135,7 @@ export class MyBagPanel extends Panel {
    if (!success) return;
    const excludeSp = true;      //排除道具
    let records = []
@@ -155,6 +157,10 @@ export class MyBagPanel extends Panel {
      });
    }
+    if (records.length == 0) {
+      this.None_list.active = true;
+    }
    this.toolDate = records;
    this.Tool_List.reloadData();
@@ -198,12 +204,16 @@ export class MyBagPanel extends Panel {
  }
  clickToCheck = (url, id) => {
-    this.hidePanel()
+    return _asyncThrottle(
-    if (url) {
+      () => {
-      window.location.href = url;
+        if (url) {
-    } else {
+          window.location.href = url;
-      window.location.href = `/aaw/projectx/takePrize?projectOrderNo=${id}`;
+        } else {
-    }
+          window.location.href = `/aaw/projectx/takePrize?projectOrderNo=${id}`;
+        }
+      }
+    )
  }
  clickToBuy = _asyncThrottle(async () => {

--- a/assets/Scripts/Panels/ProPop.ts
+++ b/assets/Scripts/Panels/ProPop.ts
@@ -55,7 +55,7 @@ export default class ProPop extends Panel {
        } = await creditsCost("exchang_1", "doExchange", `sp_deduct_desc`, consumeSp.quantity);
        if (!costSuc) {
-            showToast("预扣积分失败");
+            showToast("积分数量不足");
            return;
        }

--- a/assets/Scripts/Scenes/BlessingBagPage.ts
+++ b/assets/Scripts/Scenes/BlessingBagPage.ts
@@ -173,8 +173,6 @@ export class BlessingBagPage extends Scene {
                    prizeName.getComponent(Label).string = item.prizeName
                })
            }
        })
@@ -202,8 +200,6 @@ export class BlessingBagPage extends Scene {
                Label_task_name.getComponent(Label).string = `${item.title}(${item.completedSize}/${item.intervalLimitSize})`
            }
            const bag_num = EarnList.getChildByName("bag_num")
            bag_num.getComponent(Label).string = item.subTitle

--- a/assets/Scripts/Scenes/HomeScene.ts
+++ b/assets/Scripts/Scenes/HomeScene.ts
@@ -23,6 +23,7 @@ import SnakeSkin from "../Panels/SnakeSkin";
 import shareStore from "../store/shareStore";
 import { sendWebNetWithToken, WebNetName } from "../Utils/WebNet/WebNet";
 import { getUrlParams } from "../Utils/WebNet/web/webTools";
+import FirstSkinPanel from "../Panels/FirstSkinPanel";
 const { ccclass, property } = _decorator;
@@ -86,7 +87,8 @@ export class HomeScene extends Scene {
      rankPopList,
      newGetSpId,
      newGetSpImage,
-      newGetSpName
+      newGetSpName,
+      firstEntryFlag
    } = store.homeInfo || {};
    if (signPopFlag) { // 签到弹窗
@@ -101,6 +103,9 @@ export class HomeScene extends Scene {
      showPanel(SnakeSkin, { newGetSpImage, newGetSpName })
    }
+    if(firstEntryFlag){
+      showPanel(FirstSkinPanel)
+    }
    UIMgr.ins.preloadScene(MainGame);
  }
@@ -180,7 +185,7 @@ export class HomeScene extends Scene {
  clickProp = _asyncThrottle(async () => {
    if (!store.checkActTime()) return;
-    await changeScene(PropPage)
+    await changeScene(PropPage,{ifFrom:HomeScene})
  })
  clickDetail = _asyncThrottle(async () => {

--- a/assets/Scripts/Scenes/MainGame/AISnake.ts
+++ b/assets/Scripts/Scenes/MainGame/AISnake.ts
--- a/assets/Scripts/store/shareStore.ts
+++ b/assets/Scripts/store/shareStore.ts
@@ -3,7 +3,7 @@ import { assetManager, ImageAsset, SpriteFrame, Texture2D } from "cc";
 import { getUrlParams } from "../Utils/WebNet/web/webTools";
 import { sendWebNet, WebNetName } from "../Utils/WebNet/WebNet";
 import store from "./store";
-import { showShareGuide } from "../../Module/UIFast";
+import {showShareGuide, showToast} from "../../Module/UIFast";
 const { makeAutoObservable } = mobx;
@@ -29,6 +29,7 @@ class ShareStore {
            this.inviteInfo.inviteCode = genCodeData.inviteCode;
        }
        this.inviteInfo.shareUrl = store.frontVariable.loginUrl
            + `&inviteCode=${genCodeData.inviteCode}`;

--- a/assets/Scripts/store/store.ts
+++ b/assets/Scripts/store/store.ts
@@ -23,6 +23,7 @@ export interface IHomeInfo {
    newGetSpImage: string;
    luckBenefitDesc: string;
    benefitDesc: string;
+    firstEntryFlag: boolean;
    rankInfos: {
        index: number;
        nickname: string;
@@ -70,6 +71,7 @@ class Store {
        newGetSpImage: "",
        luckBenefitDesc: "",
        benefitDesc: "",
+        firstEntryFlag: false,
        newGetSpId: null,
        rankInfos: [],
        rankPopList: [],
@@ -83,13 +85,13 @@ class Store {
        }
        this.homeInfo = data;
-        console.log(data.bagPopVO,"积分氛围好")
+        console.log(data.bagPopVO, "积分氛围好")
        if (data.bagPopVO) {
            console.log(222)
            showPanel(GetPrize, [{
                prizeName: data.bagPopVO.bagName,
                prizeImg: data.bagPopVO.bagImg,
-                sendCount:data.bagPopVO.bagNum
+                sendCount: data.bagPopVO.bagNum
            }])
        }
    }
@@ -122,26 +124,26 @@ class Store {
    }
-  checkActTime = (isAllow = false) => {
+    checkActTime = (isAllow = false) => {
-    const { actStartTime, actEndTime, currentTime } = this.homeInfo || {};
-    if (actStartTime > currentTime) {
-      console.log('活动未开始');
-      showToast("活动未开始")
-      return false
-    }
-    if (actEndTime < currentTime && !isAllow) {
-      console.log('活动未开始');
-      showToast("活动已结束")
+        const {actStartTime, actEndTime, currentTime} = this.homeInfo || {};
-      return false
-    }
+        if (actStartTime > currentTime) {
-    console.log('checkActTime');
+            console.log('活动未开始');
-    return true
+            showToast("活动未开始")
-  }
+            return false
+        }
+        if (actEndTime < currentTime && !isAllow) {
+            console.log('活动未开始');
+            showToast("活动已结束")
+            return false
+        }
+        console.log('checkActTime');
+        return true
+    }
    // // 道具页接口
    // propPageInfo: {}
    //
@@ -161,8 +163,10 @@ class Store {
        const inviteCode = getUrlParams("inviteCode");
        if (!inviteCode) return;
-        const {success} = await sendWebNetWithToken(WebNetName.doAssist, {inviteCode});
+        const {success, data} = await sendWebNetWithToken(WebNetName.doAssist, {inviteCode});
+        if (!success) {
+            showToast(data.extra)
+        }
    }

--- a/build/web-mobile/index.html
+++ b/build/web-mobile/index.html
@@ -98,14 +98,14 @@
    </style>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/assets/plugin/zepto.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/assets/plugin/zepto.min.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/assets/plugin/declare-process.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/assets/plugin/declare-process.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/assets/plugin/jszip.min.v3.10.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/assets/plugin/jszip.min.v3.10.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/assets/plugin/rem.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/assets/plugin/rem.min.js"></script>
    <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/style.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/style.css" />-->
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/custom.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/custom.css" />-->
 <!--    <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
 <!--    <script>eruda.init()</script>-->
@@ -118,20 +118,20 @@
 </div>
 <!-- Polyfills bundle. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/polyfills.bundle.js" charset="utf-8"></script>
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/system.bundle.js" charset="utf-8"></script>
 <!-- Import map -->
-<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
+<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
 <script type="systemjs-importmap" charset="utf-8">
-    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/cocos-js/cc.js"}}
+    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/cocos-js/cc.js"}}
 </script>
 <script>
-    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733995245361/index.js').catch(function (err) {
+    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1734007957761/index.js').catch(function (err) {
        console.error(err);
    })
 </script>

--- a/preview-template/mock/bag/draw.do.json
+++ b/preview-template/mock/bag/draw.do.json
@@ -8,30 +8,6 @@
        "prizeImg": "dolore laboris",
        "prizeName": "minim ut officia fugiat",
        "sendCount": "quis fugiat dolor amet sint"
-      },
-      {
-        "prizeId": "cillum",
-        "prizeImg": "est",
-        "prizeName": "commodo elit",
-        "sendCount": "labore nisi culpa ad"
-      },
-      {
-        "prizeId": "culpa cupidatat sed qui",
-        "prizeImg": "velit dolor minim aute Excepteur",
-        "prizeName": "cillum",
-        "sendCount": "pariatur aute tempor"
-      },
-      {
-        "prizeId": "fugiat veniam",
-        "prizeImg": "sed",
-        "prizeName": "et id veniam consectetur aliquip",
-        "sendCount": "dolore eu cillum velit laboris"
-      },
-      {
-        "prizeId": "aute ut deserunt eiusmod",
-        "prizeImg": "deserunt do dolor ea",
-        "prizeName": "sit esse sint do consequat",
-        "sendCount": "et exercitation sint dolore cillum"
      }
    ]
  },

--- a/preview-template/mock/home/index.do.json
+++ b/preview-template/mock/home/index.do.json
@@ -4,7 +4,11 @@
      "actEndTime": 1735638689560,
      "actStartTime": 1733565086149,
      "avatar": null,
-      "bagPopVO": null,
+      "bagPopVO": {
+          "bagNum": 42900739.4793739,
+          "bagImg": "sunt esse ea Duis",
+          "bagName": "sint"
+      },
      "benefitDesc": "规则权益文案",
      "continueSignDays": 1,
      "creditsNum": 1011347,
@@ -33,7 +37,7 @@
          }
      ],
      "rankPopList": [],
-      "signPopFlag": false
+      "signPopFlag": true
  },
  "message": null,
  "success": true,

--- a/preview-template/mock/inviteAssist_1/getInviteCode.do.json
+++ b/preview-template/mock/inviteAssist_1/getInviteCode.do.json
@@ -5,7 +5,7 @@
    "dueTime": 58641469.716245055,
    "extra": "ea ullamco in"
  },
-  "success": true,
+  "success": false,
  "code": null,
  "message": null
 }
\ No newline at end of file
--- a/preview-template/mock/records.query.json
+++ b/preview-template/mock/records.query.json
@@ -106,5 +106,6 @@
      "prizeId": "g0e432eeb"
    }
  ],
+  "data":[],
  "success": true
 }
\ No newline at end of file
--- a/profiles/v2/packages/builder.json
+++ b/profiles/v2/packages/builder.json
@@ -45,8 +45,8 @@
        "progress": 1,
        "state": "success",
        "stage": "build",
-        "message": "2024-12-12 17:21:46 build success in 1 min 1 s!",
+        "message": "2024-12-12 20:53:51 build success in 1 min 13 s!",
-        "detailMessage": "%c兑吧发布插件 >> 版本号:1733995245361\rcolor: green\r",
+        "detailMessage": "builder:build-project-total (73496ms)\r",
        "options": {
          "name": "cocos-template-3d",
          "server": "",
@@ -109,7 +109,7 @@
          "__version__": "1.3.8",
          "logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
        },
-        "time": "2024-12-12 17:20:45",
+        "time": "2024-12-12 20:52:37",
        "dirty": false
      }
    }