Selaa lähdekoodia

替换元素资源

woso_javan 1 viikko sitten
vanhempi
commit
fa66e79485
65 muutettua tiedostoa jossa 599 lisäystä ja 596 poistoa
  1. 1 1
      assets/bundles/game/CommonShelve.prefab
  2. BIN
      assets/bundles/game/image/guizi1.png
  3. 16 16
      assets/bundles/game/image/guizi1.png.meta
  4. BIN
      assets/bundles/icon/ls/ls1.png
  5. 20 20
      assets/bundles/icon/ls/ls1.png.meta
  6. BIN
      assets/bundles/icon/ls/ls10.png
  7. 20 20
      assets/bundles/icon/ls/ls10.png.meta
  8. BIN
      assets/bundles/icon/ls/ls11.png
  9. 20 20
      assets/bundles/icon/ls/ls11.png.meta
  10. BIN
      assets/bundles/icon/ls/ls12.png
  11. 20 20
      assets/bundles/icon/ls/ls12.png.meta
  12. BIN
      assets/bundles/icon/ls/ls13.png
  13. 20 20
      assets/bundles/icon/ls/ls13.png.meta
  14. BIN
      assets/bundles/icon/ls/ls14.png
  15. 20 20
      assets/bundles/icon/ls/ls14.png.meta
  16. BIN
      assets/bundles/icon/ls/ls15.png
  17. 20 20
      assets/bundles/icon/ls/ls15.png.meta
  18. BIN
      assets/bundles/icon/ls/ls16.png
  19. 20 20
      assets/bundles/icon/ls/ls16.png.meta
  20. BIN
      assets/bundles/icon/ls/ls17.png
  21. 20 20
      assets/bundles/icon/ls/ls17.png.meta
  22. BIN
      assets/bundles/icon/ls/ls18.png
  23. 20 20
      assets/bundles/icon/ls/ls18.png.meta
  24. BIN
      assets/bundles/icon/ls/ls19.png
  25. 26 26
      assets/bundles/icon/ls/ls19.png.meta
  26. BIN
      assets/bundles/icon/ls/ls2.png
  27. 20 20
      assets/bundles/icon/ls/ls2.png.meta
  28. BIN
      assets/bundles/icon/ls/ls20.png
  29. 20 20
      assets/bundles/icon/ls/ls20.png.meta
  30. BIN
      assets/bundles/icon/ls/ls21.png
  31. 20 20
      assets/bundles/icon/ls/ls21.png.meta
  32. BIN
      assets/bundles/icon/ls/ls22.png
  33. 20 20
      assets/bundles/icon/ls/ls22.png.meta
  34. BIN
      assets/bundles/icon/ls/ls23.png
  35. 20 20
      assets/bundles/icon/ls/ls23.png.meta
  36. BIN
      assets/bundles/icon/ls/ls24.png
  37. 20 20
      assets/bundles/icon/ls/ls24.png.meta
  38. BIN
      assets/bundles/icon/ls/ls25.png
  39. 20 20
      assets/bundles/icon/ls/ls25.png.meta
  40. BIN
      assets/bundles/icon/ls/ls26.png
  41. 20 20
      assets/bundles/icon/ls/ls26.png.meta
  42. BIN
      assets/bundles/icon/ls/ls27.png
  43. 20 20
      assets/bundles/icon/ls/ls27.png.meta
  44. BIN
      assets/bundles/icon/ls/ls28.png
  45. 20 20
      assets/bundles/icon/ls/ls28.png.meta
  46. BIN
      assets/bundles/icon/ls/ls3.png
  47. 20 20
      assets/bundles/icon/ls/ls3.png.meta
  48. BIN
      assets/bundles/icon/ls/ls4.png
  49. 20 20
      assets/bundles/icon/ls/ls4.png.meta
  50. BIN
      assets/bundles/icon/ls/ls5.png
  51. 20 20
      assets/bundles/icon/ls/ls5.png.meta
  52. BIN
      assets/bundles/icon/ls/ls6.png
  53. 20 20
      assets/bundles/icon/ls/ls6.png.meta
  54. BIN
      assets/bundles/icon/ls/ls7.png
  55. 20 20
      assets/bundles/icon/ls/ls7.png.meta
  56. BIN
      assets/bundles/icon/ls/ls8.png
  57. 20 20
      assets/bundles/icon/ls/ls8.png.meta
  58. BIN
      assets/bundles/icon/ls/ls9.png
  59. 20 20
      assets/bundles/icon/ls/ls9.png.meta
  60. 2 2
      assets/bundles/ui/item/MainItem.prefab
  61. 1 1
      assets/scripts/Global.ts
  62. 3 2
      assets/scripts/game/CommonShelve.ts
  63. 2 1
      assets/scripts/game/Stage.ts
  64. 6 6
      assets/scripts/manager/GameMgr.ts
  65. 2 1
      assets/scripts/uiItem/MainItem.ts

+ 1 - 1
assets/bundles/game/CommonShelve.prefab

@@ -175,7 +175,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

BIN
assets/bundles/game/image/guizi1.png


+ 16 - 16
assets/bundles/game/image/guizi1.png.meta

@@ -44,9 +44,9 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 4,
         "trimY": 0,
-        "width": 230,
+        "width": 222,
         "height": 145,
         "rawWidth": 230,
         "rawHeight": 145,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -115,
+            -111,
             -72.5,
             0,
-            115,
+            111,
             -72.5,
             0,
-            -115,
+            -111,
             72.5,
             0,
-            115,
+            111,
             72.5,
             0
           ],
@@ -83,32 +83,32 @@
             3
           ],
           "uv": [
-            0,
+            4,
             145,
-            230,
+            226,
             145,
+            4,
             0,
-            0,
-            230,
+            226,
             0
           ],
           "nuv": [
+            0.017391304347826087,
             0,
+            0.9826086956521739,
             0,
+            0.017391304347826087,
             1,
-            0,
-            0,
-            1,
-            1,
+            0.9826086956521739,
             1
           ],
           "minPos": [
-            -115,
+            -111,
             -72.5,
             0
           ],
           "maxPos": [
-            115,
+            111,
             72.5,
             0
           ]

BIN
assets/bundles/icon/ls/ls1.png


+ 20 - 20
assets/bundles/icon/ls/ls1.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 57,
-        "height": 94,
-        "rawWidth": 57,
-        "rawHeight": 94,
+        "width": 156,
+        "height": 129,
+        "rawWidth": 156,
+        "rawHeight": 129,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -28.5,
-            -47,
+            -78,
+            -64.5,
             0,
-            28.5,
-            -47,
+            78,
+            -64.5,
             0,
-            -28.5,
-            47,
+            -78,
+            64.5,
             0,
-            28.5,
-            47,
+            78,
+            64.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            94,
-            57,
-            94,
+            129,
+            156,
+            129,
             0,
             0,
-            57,
+            156,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -28.5,
-            -47,
+            -78,
+            -64.5,
             0
           ],
           "maxPos": [
-            28.5,
-            47,
+            78,
+            64.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls10.png


+ 20 - 20
assets/bundles/icon/ls/ls10.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 64,
-        "height": 90,
-        "rawWidth": 64,
-        "rawHeight": 90,
+        "width": 122,
+        "height": 145,
+        "rawWidth": 122,
+        "rawHeight": 145,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -32,
-            -45,
+            -61,
+            -72.5,
             0,
-            32,
-            -45,
+            61,
+            -72.5,
             0,
-            -32,
-            45,
+            -61,
+            72.5,
             0,
-            32,
-            45,
+            61,
+            72.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            90,
-            64,
-            90,
+            145,
+            122,
+            145,
             0,
             0,
-            64,
+            122,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -32,
-            -45,
+            -61,
+            -72.5,
             0
           ],
           "maxPos": [
-            32,
-            45,
+            61,
+            72.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls11.png


+ 20 - 20
assets/bundles/icon/ls/ls11.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 55,
-        "height": 114,
-        "rawWidth": 55,
-        "rawHeight": 114,
+        "width": 146,
+        "height": 116,
+        "rawWidth": 146,
+        "rawHeight": 116,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -27.5,
-            -57,
+            -73,
+            -58,
             0,
-            27.5,
-            -57,
+            73,
+            -58,
             0,
-            -27.5,
-            57,
+            -73,
+            58,
             0,
-            27.5,
-            57,
+            73,
+            58,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            114,
-            55,
-            114,
+            116,
+            146,
+            116,
             0,
             0,
-            55,
+            146,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -27.5,
-            -57,
+            -73,
+            -58,
             0
           ],
           "maxPos": [
-            27.5,
-            57,
+            73,
+            58,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls12.png


+ 20 - 20
assets/bundles/icon/ls/ls12.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 55,
-        "height": 114,
-        "rawWidth": 55,
-        "rawHeight": 114,
+        "width": 128,
+        "height": 111,
+        "rawWidth": 128,
+        "rawHeight": 111,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -27.5,
-            -57,
+            -64,
+            -55.5,
             0,
-            27.5,
-            -57,
+            64,
+            -55.5,
             0,
-            -27.5,
-            57,
+            -64,
+            55.5,
             0,
-            27.5,
-            57,
+            64,
+            55.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            114,
-            55,
-            114,
+            111,
+            128,
+            111,
             0,
             0,
-            55,
+            128,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -27.5,
-            -57,
+            -64,
+            -55.5,
             0
           ],
           "maxPos": [
-            27.5,
-            57,
+            64,
+            55.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls13.png


+ 20 - 20
assets/bundles/icon/ls/ls13.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 46,
-        "height": 102,
-        "rawWidth": 46,
-        "rawHeight": 102,
+        "width": 120,
+        "height": 125,
+        "rawWidth": 120,
+        "rawHeight": 125,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -23,
-            -51,
+            -60,
+            -62.5,
             0,
-            23,
-            -51,
+            60,
+            -62.5,
             0,
-            -23,
-            51,
+            -60,
+            62.5,
             0,
-            23,
-            51,
+            60,
+            62.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            102,
-            46,
-            102,
+            125,
+            120,
+            125,
             0,
             0,
-            46,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -23,
-            -51,
+            -60,
+            -62.5,
             0
           ],
           "maxPos": [
-            23,
-            51,
+            60,
+            62.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls14.png


+ 20 - 20
assets/bundles/icon/ls/ls14.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 39,
-        "height": 111,
-        "rawWidth": 39,
-        "rawHeight": 111,
+        "width": 128,
+        "height": 125,
+        "rawWidth": 128,
+        "rawHeight": 125,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -19.5,
-            -55.5,
+            -64,
+            -62.5,
             0,
-            19.5,
-            -55.5,
+            64,
+            -62.5,
             0,
-            -19.5,
-            55.5,
+            -64,
+            62.5,
             0,
-            19.5,
-            55.5,
+            64,
+            62.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            111,
-            39,
-            111,
+            125,
+            128,
+            125,
             0,
             0,
-            39,
+            128,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -19.5,
-            -55.5,
+            -64,
+            -62.5,
             0
           ],
           "maxPos": [
-            19.5,
-            55.5,
+            64,
+            62.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls15.png


+ 20 - 20
assets/bundles/icon/ls/ls15.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 65,
-        "height": 65,
-        "rawWidth": 65,
-        "rawHeight": 65,
+        "width": 139,
+        "height": 120,
+        "rawWidth": 139,
+        "rawHeight": 120,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -32.5,
-            -32.5,
+            -69.5,
+            -60,
             0,
-            32.5,
-            -32.5,
+            69.5,
+            -60,
             0,
-            -32.5,
-            32.5,
+            -69.5,
+            60,
             0,
-            32.5,
-            32.5,
+            69.5,
+            60,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            65,
-            65,
-            65,
+            120,
+            139,
+            120,
             0,
             0,
-            65,
+            139,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -32.5,
-            -32.5,
+            -69.5,
+            -60,
             0
           ],
           "maxPos": [
-            32.5,
-            32.5,
+            69.5,
+            60,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls16.png


+ 20 - 20
assets/bundles/icon/ls/ls16.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 56,
-        "height": 85,
-        "rawWidth": 56,
-        "rawHeight": 85,
+        "width": 214,
+        "height": 145,
+        "rawWidth": 214,
+        "rawHeight": 145,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -28,
-            -42.5,
+            -107,
+            -72.5,
             0,
-            28,
-            -42.5,
+            107,
+            -72.5,
             0,
-            -28,
-            42.5,
+            -107,
+            72.5,
             0,
-            28,
-            42.5,
+            107,
+            72.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            85,
-            56,
-            85,
+            145,
+            214,
+            145,
             0,
             0,
-            56,
+            214,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -28,
-            -42.5,
+            -107,
+            -72.5,
             0
           ],
           "maxPos": [
-            28,
-            42.5,
+            107,
+            72.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls17.png


+ 20 - 20
assets/bundles/icon/ls/ls17.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 55,
-        "height": 70,
-        "rawWidth": 55,
-        "rawHeight": 70,
+        "width": 146,
+        "height": 121,
+        "rawWidth": 146,
+        "rawHeight": 121,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -27.5,
-            -35,
+            -73,
+            -60.5,
             0,
-            27.5,
-            -35,
+            73,
+            -60.5,
             0,
-            -27.5,
-            35,
+            -73,
+            60.5,
             0,
-            27.5,
-            35,
+            73,
+            60.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            70,
-            55,
-            70,
+            121,
+            146,
+            121,
             0,
             0,
-            55,
+            146,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -27.5,
-            -35,
+            -73,
+            -60.5,
             0
           ],
           "maxPos": [
-            27.5,
-            35,
+            73,
+            60.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls18.png


+ 20 - 20
assets/bundles/icon/ls/ls18.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 84,
-        "rawWidth": 62,
-        "rawHeight": 84,
+        "width": 120,
+        "height": 130,
+        "rawWidth": 120,
+        "rawHeight": 130,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -42,
+            -60,
+            -65,
             0,
-            31,
-            -42,
+            60,
+            -65,
             0,
-            -31,
-            42,
+            -60,
+            65,
             0,
-            31,
-            42,
+            60,
+            65,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            84,
-            62,
-            84,
+            130,
+            120,
+            130,
             0,
             0,
-            62,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -31,
-            -42,
+            -60,
+            -65,
             0
           ],
           "maxPos": [
-            31,
-            42,
+            60,
+            65,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls19.png


+ 26 - 26
assets/bundles/icon/ls/ls19.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 111,
-        "rawWidth": 63,
-        "rawHeight": 111,
+        "width": 138,
+        "height": 126,
+        "rawWidth": 138,
+        "rawHeight": 126,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -55.5,
+            -69,
+            -63,
             0,
-            31,
-            -55.5,
+            69,
+            -63,
             0,
-            -31,
-            55.5,
+            -69,
+            63,
             0,
-            31,
-            55.5,
+            69,
+            63,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            1,
-            111,
-            63,
-            111,
-            1,
             0,
-            63,
+            126,
+            138,
+            126,
+            0,
+            0,
+            138,
             0
           ],
           "nuv": [
-            0.015873015873015872,
+            0,
             0,
             1,
             0,
-            0.015873015873015872,
+            0,
             1,
             1,
             1
           ],
           "minPos": [
-            -31,
-            -55.5,
+            -69,
+            -63,
             0
           ],
           "maxPos": [
-            31,
-            55.5,
+            69,
+            63,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls2.png


+ 20 - 20
assets/bundles/icon/ls/ls2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 61,
-        "height": 80,
-        "rawWidth": 61,
-        "rawHeight": 80,
+        "width": 114,
+        "height": 129,
+        "rawWidth": 114,
+        "rawHeight": 129,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -30.5,
-            -40,
+            -57,
+            -64.5,
             0,
-            30.5,
-            -40,
+            57,
+            -64.5,
             0,
-            -30.5,
-            40,
+            -57,
+            64.5,
             0,
-            30.5,
-            40,
+            57,
+            64.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            80,
-            61,
-            80,
+            129,
+            114,
+            129,
             0,
             0,
-            61,
+            114,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -30.5,
-            -40,
+            -57,
+            -64.5,
             0
           ],
           "maxPos": [
-            30.5,
-            40,
+            57,
+            64.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls20.png


+ 20 - 20
assets/bundles/icon/ls/ls20.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 49,
-        "height": 109,
-        "rawWidth": 49,
-        "rawHeight": 109,
+        "width": 104,
+        "height": 132,
+        "rawWidth": 104,
+        "rawHeight": 132,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -24.5,
-            -54.5,
+            -52,
+            -66,
             0,
-            24.5,
-            -54.5,
+            52,
+            -66,
             0,
-            -24.5,
-            54.5,
+            -52,
+            66,
             0,
-            24.5,
-            54.5,
+            52,
+            66,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            109,
-            49,
-            109,
+            132,
+            104,
+            132,
             0,
             0,
-            49,
+            104,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -24.5,
-            -54.5,
+            -52,
+            -66,
             0
           ],
           "maxPos": [
-            24.5,
-            54.5,
+            52,
+            66,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls21.png


+ 20 - 20
assets/bundles/icon/ls/ls21.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 49,
-        "height": 109,
-        "rawWidth": 49,
-        "rawHeight": 109,
+        "width": 84,
+        "height": 144,
+        "rawWidth": 84,
+        "rawHeight": 144,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -24.5,
-            -54.5,
+            -42,
+            -72,
             0,
-            24.5,
-            -54.5,
+            42,
+            -72,
             0,
-            -24.5,
-            54.5,
+            -42,
+            72,
             0,
-            24.5,
-            54.5,
+            42,
+            72,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            109,
-            49,
-            109,
+            144,
+            84,
+            144,
             0,
             0,
-            49,
+            84,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -24.5,
-            -54.5,
+            -42,
+            -72,
             0
           ],
           "maxPos": [
-            24.5,
-            54.5,
+            42,
+            72,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls22.png


+ 20 - 20
assets/bundles/icon/ls/ls22.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 87,
-        "rawWidth": 62,
-        "rawHeight": 87,
+        "width": 136,
+        "height": 127,
+        "rawWidth": 136,
+        "rawHeight": 127,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -43.5,
+            -68,
+            -63.5,
             0,
-            31,
-            -43.5,
+            68,
+            -63.5,
             0,
-            -31,
-            43.5,
+            -68,
+            63.5,
             0,
-            31,
-            43.5,
+            68,
+            63.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            87,
-            62,
-            87,
+            127,
+            136,
+            127,
             0,
             0,
-            62,
+            136,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -31,
-            -43.5,
+            -68,
+            -63.5,
             0
           ],
           "maxPos": [
-            31,
-            43.5,
+            68,
+            63.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls23.png


+ 20 - 20
assets/bundles/icon/ls/ls23.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 43,
-        "height": 107,
-        "rawWidth": 43,
-        "rawHeight": 107,
+        "width": 130,
+        "height": 134,
+        "rawWidth": 130,
+        "rawHeight": 134,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -21.5,
-            -53.5,
+            -65,
+            -67,
             0,
-            21.5,
-            -53.5,
+            65,
+            -67,
             0,
-            -21.5,
-            53.5,
+            -65,
+            67,
             0,
-            21.5,
-            53.5,
+            65,
+            67,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            107,
-            43,
-            107,
+            134,
+            130,
+            134,
             0,
             0,
-            43,
+            130,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -21.5,
-            -53.5,
+            -65,
+            -67,
             0
           ],
           "maxPos": [
-            21.5,
-            53.5,
+            65,
+            67,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls24.png


+ 20 - 20
assets/bundles/icon/ls/ls24.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 99,
-        "rawWidth": 62,
-        "rawHeight": 99,
+        "width": 120,
+        "height": 123,
+        "rawWidth": 120,
+        "rawHeight": 123,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -49.5,
+            -60,
+            -61.5,
             0,
-            31,
-            -49.5,
+            60,
+            -61.5,
             0,
-            -31,
-            49.5,
+            -60,
+            61.5,
             0,
-            31,
-            49.5,
+            60,
+            61.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            99,
-            62,
-            99,
+            123,
+            120,
+            123,
             0,
             0,
-            62,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -31,
-            -49.5,
+            -60,
+            -61.5,
             0
           ],
           "maxPos": [
-            31,
-            49.5,
+            60,
+            61.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls25.png


+ 20 - 20
assets/bundles/icon/ls/ls25.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 53,
-        "height": 102,
-        "rawWidth": 53,
-        "rawHeight": 102,
+        "width": 139,
+        "height": 115,
+        "rawWidth": 139,
+        "rawHeight": 115,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -26.5,
-            -51,
+            -69.5,
+            -57.5,
             0,
-            26.5,
-            -51,
+            69.5,
+            -57.5,
             0,
-            -26.5,
-            51,
+            -69.5,
+            57.5,
             0,
-            26.5,
-            51,
+            69.5,
+            57.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            102,
-            53,
-            102,
+            115,
+            139,
+            115,
             0,
             0,
-            53,
+            139,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -26.5,
-            -51,
+            -69.5,
+            -57.5,
             0
           ],
           "maxPos": [
-            26.5,
-            51,
+            69.5,
+            57.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls26.png


+ 20 - 20
assets/bundles/icon/ls/ls26.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 39,
-        "height": 109,
-        "rawWidth": 39,
-        "rawHeight": 109,
+        "width": 133,
+        "height": 130,
+        "rawWidth": 133,
+        "rawHeight": 130,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -19.5,
-            -54.5,
+            -66.5,
+            -65,
             0,
-            19.5,
-            -54.5,
+            66.5,
+            -65,
             0,
-            -19.5,
-            54.5,
+            -66.5,
+            65,
             0,
-            19.5,
-            54.5,
+            66.5,
+            65,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            109,
-            39,
-            109,
+            130,
+            133,
+            130,
             0,
             0,
-            39,
+            133,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -19.5,
-            -54.5,
+            -66.5,
+            -65,
             0
           ],
           "maxPos": [
-            19.5,
-            54.5,
+            66.5,
+            65,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls27.png


+ 20 - 20
assets/bundles/icon/ls/ls27.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 51,
-        "height": 89,
-        "rawWidth": 51,
-        "rawHeight": 89,
+        "width": 154,
+        "height": 125,
+        "rawWidth": 154,
+        "rawHeight": 125,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -25.5,
-            -44.5,
+            -77,
+            -62.5,
             0,
-            25.5,
-            -44.5,
+            77,
+            -62.5,
             0,
-            -25.5,
-            44.5,
+            -77,
+            62.5,
             0,
-            25.5,
-            44.5,
+            77,
+            62.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            89,
-            51,
-            89,
+            125,
+            154,
+            125,
             0,
             0,
-            51,
+            154,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -25.5,
-            -44.5,
+            -77,
+            -62.5,
             0
           ],
           "maxPos": [
-            25.5,
-            44.5,
+            77,
+            62.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls28.png


+ 20 - 20
assets/bundles/icon/ls/ls28.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 51,
-        "height": 89,
-        "rawWidth": 51,
-        "rawHeight": 89,
+        "width": 110,
+        "height": 117,
+        "rawWidth": 110,
+        "rawHeight": 117,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -25.5,
-            -44.5,
+            -55,
+            -58.5,
             0,
-            25.5,
-            -44.5,
+            55,
+            -58.5,
             0,
-            -25.5,
-            44.5,
+            -55,
+            58.5,
             0,
-            25.5,
-            44.5,
+            55,
+            58.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            89,
-            51,
-            89,
+            117,
+            110,
+            117,
             0,
             0,
-            51,
+            110,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -25.5,
-            -44.5,
+            -55,
+            -58.5,
             0
           ],
           "maxPos": [
-            25.5,
-            44.5,
+            55,
+            58.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls3.png


+ 20 - 20
assets/bundles/icon/ls/ls3.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 63,
-        "height": 81,
-        "rawWidth": 63,
-        "rawHeight": 81,
+        "width": 128,
+        "height": 126,
+        "rawWidth": 128,
+        "rawHeight": 126,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31.5,
-            -40.5,
+            -64,
+            -63,
             0,
-            31.5,
-            -40.5,
+            64,
+            -63,
             0,
-            -31.5,
-            40.5,
+            -64,
+            63,
             0,
-            31.5,
-            40.5,
+            64,
+            63,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            81,
-            63,
-            81,
+            126,
+            128,
+            126,
             0,
             0,
-            63,
+            128,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -31.5,
-            -40.5,
+            -64,
+            -63,
             0
           ],
           "maxPos": [
-            31.5,
-            40.5,
+            64,
+            63,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls4.png


+ 20 - 20
assets/bundles/icon/ls/ls4.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 54,
-        "height": 114,
-        "rawWidth": 54,
-        "rawHeight": 114,
+        "width": 130,
+        "height": 119,
+        "rawWidth": 130,
+        "rawHeight": 119,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -27,
-            -57,
+            -65,
+            -59.5,
             0,
-            27,
-            -57,
+            65,
+            -59.5,
             0,
-            -27,
-            57,
+            -65,
+            59.5,
             0,
-            27,
-            57,
+            65,
+            59.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            114,
-            54,
-            114,
+            119,
+            130,
+            119,
             0,
             0,
-            54,
+            130,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -27,
-            -57,
+            -65,
+            -59.5,
             0
           ],
           "maxPos": [
-            27,
-            57,
+            65,
+            59.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls5.png


+ 20 - 20
assets/bundles/icon/ls/ls5.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 67,
-        "height": 75,
-        "rawWidth": 67,
-        "rawHeight": 75,
+        "width": 136,
+        "height": 129,
+        "rawWidth": 136,
+        "rawHeight": 129,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -33.5,
-            -37.5,
+            -68,
+            -64.5,
             0,
-            33.5,
-            -37.5,
+            68,
+            -64.5,
             0,
-            -33.5,
-            37.5,
+            -68,
+            64.5,
             0,
-            33.5,
-            37.5,
+            68,
+            64.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            75,
-            67,
-            75,
+            129,
+            136,
+            129,
             0,
             0,
-            67,
+            136,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -33.5,
-            -37.5,
+            -68,
+            -64.5,
             0
           ],
           "maxPos": [
-            33.5,
-            37.5,
+            68,
+            64.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls6.png


+ 20 - 20
assets/bundles/icon/ls/ls6.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 41,
-        "height": 115,
-        "rawWidth": 41,
-        "rawHeight": 115,
+        "width": 127,
+        "height": 125,
+        "rawWidth": 127,
+        "rawHeight": 125,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -20.5,
-            -57.5,
+            -63.5,
+            -62.5,
             0,
-            20.5,
-            -57.5,
+            63.5,
+            -62.5,
             0,
-            -20.5,
-            57.5,
+            -63.5,
+            62.5,
             0,
-            20.5,
-            57.5,
+            63.5,
+            62.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            115,
-            41,
-            115,
+            125,
+            127,
+            125,
             0,
             0,
-            41,
+            127,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -20.5,
-            -57.5,
+            -63.5,
+            -62.5,
             0
           ],
           "maxPos": [
-            20.5,
-            57.5,
+            63.5,
+            62.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls7.png


+ 20 - 20
assets/bundles/icon/ls/ls7.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 36,
-        "height": 105,
-        "rawWidth": 36,
-        "rawHeight": 105,
+        "width": 135,
+        "height": 127,
+        "rawWidth": 135,
+        "rawHeight": 127,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -18,
-            -52.5,
+            -67.5,
+            -63.5,
             0,
-            18,
-            -52.5,
+            67.5,
+            -63.5,
             0,
-            -18,
-            52.5,
+            -67.5,
+            63.5,
             0,
-            18,
-            52.5,
+            67.5,
+            63.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            105,
-            36,
-            105,
+            127,
+            135,
+            127,
             0,
             0,
-            36,
+            135,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -18,
-            -52.5,
+            -67.5,
+            -63.5,
             0
           ],
           "maxPos": [
-            18,
-            52.5,
+            67.5,
+            63.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls8.png


+ 20 - 20
assets/bundles/icon/ls/ls8.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 68,
-        "height": 99,
-        "rawWidth": 68,
-        "rawHeight": 99,
+        "width": 174,
+        "height": 131,
+        "rawWidth": 174,
+        "rawHeight": 131,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -34,
-            -49.5,
+            -87,
+            -65.5,
             0,
-            34,
-            -49.5,
+            87,
+            -65.5,
             0,
-            -34,
-            49.5,
+            -87,
+            65.5,
             0,
-            34,
-            49.5,
+            87,
+            65.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            99,
-            68,
-            99,
+            131,
+            174,
+            131,
             0,
             0,
-            68,
+            174,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -34,
-            -49.5,
+            -87,
+            -65.5,
             0
           ],
           "maxPos": [
-            34,
-            49.5,
+            87,
+            65.5,
             0
           ]
         },

BIN
assets/bundles/icon/ls/ls9.png


+ 20 - 20
assets/bundles/icon/ls/ls9.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 58,
-        "height": 83,
-        "rawWidth": 58,
-        "rawHeight": 83,
+        "width": 73,
+        "height": 124,
+        "rawWidth": 73,
+        "rawHeight": 124,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -29,
-            -41.5,
+            -36.5,
+            -62,
             0,
-            29,
-            -41.5,
+            36.5,
+            -62,
             0,
-            -29,
-            41.5,
+            -36.5,
+            62,
             0,
-            29,
-            41.5,
+            36.5,
+            62,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            83,
-            58,
-            83,
+            124,
+            73,
+            124,
             0,
             0,
-            58,
+            73,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -29,
-            -41.5,
+            -36.5,
+            -62,
             0
           ],
           "maxPos": [
-            29,
-            41.5,
+            36.5,
+            62,
             0
           ]
         },

+ 2 - 2
assets/bundles/ui/item/MainItem.prefab

@@ -501,7 +501,7 @@
     },
     "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1017,7 +1017,7 @@
     "tip": {
       "__id__": 10
     },
-    "mode": 0,
+    "mode": 2,
     "_id": ""
   },
   {

+ 1 - 1
assets/scripts/Global.ts

@@ -6,7 +6,7 @@ export class Global {
 
     public static readonly Default_Item = { 0: 0, 1: 3, 2: 3, 3: 3, 4: 3 }
 
-    public static readonly Goods_Offset: number = 15
+    public static readonly Goods_Offset: number = 25
 
     public static readonly Normal_Level_Coin_Default_Cnt: number = 100
     public static readonly Normal_Level_Coin_Add_Cnt: number = 10

+ 3 - 2
assets/scripts/game/CommonShelve.ts

@@ -120,15 +120,16 @@ export class CommonShelve extends ShelveBase {
 
     public createGoods(goodsId: number, slotId: number, layer: number): Goods {
         const goodsPre: Prefab = ResMgr.getRes(Bundle.Game, 'Goods')
-        const goodsNode: Node = instantiate(goodsPre)
+        let goodsNode: Node = instantiate(goodsPre)
         const goods: Goods = goodsNode.getComponent(Goods)
         const layerNode: Node = this.layers[layer]
         const pos: Vec3 = v3()
-        pos.x = (slotId - 1) * (this.uiTrans.width - 10) / 3
+        pos.x = (slotId - 1) * (this.uiTrans.width - 25) / 3
         // pos.y = layer * Global.Goods_Offset
         const baseY = layer * Global.Goods_Offset
         pos.y = slotId === 1 ? baseY + Global.Goods_Offset * 2 : baseY
         layerNode.addChild(goodsNode)
+        goodsNode.setScale(0.7, 0.7, 0.7)
         goodsNode.setPosition(pos)
         goods.Id = goodsId
         goods.Layer = layer

+ 2 - 1
assets/scripts/game/Stage.ts

@@ -89,11 +89,12 @@ export class Stage extends Component {
 
     protected start() {
         UIMgr.open(UI.Game)
-        this.tip.active = GameMgr.mode === Mode.tp && GameMgr.CurLevel === 0
+        this.tip.active = GameMgr.mode === Mode.ls && GameMgr.CurLevel === 0
         this.scheduleOnce(() => {
             if (GameMgr.isHardLevel) UIMgr.open(UI.StageTip, 'Difficulty skyrockets')
         }, 1)
 
+
         switch (GameMgr.mode) {
             case Mode.tp:
                 this.levelCfg = cfg_level_tp

+ 6 - 6
assets/scripts/manager/GameMgr.ts

@@ -51,7 +51,7 @@ export class GameMgr extends Component {
     }
 
     private static unlockedMode: Mode[] = []
-    public static mode: Mode = Mode.tp
+    public static mode: Mode = Mode.ls
 
     private static _pickedGoods: Goods = null
     private static _holdGoods: Node = null
@@ -116,11 +116,11 @@ export class GameMgr extends Component {
         }
         this.curLevel[this.mode]++
         StorageUtil.setObj('curLevel', this.curLevel)
-        if (this.mode === Mode.tp && this.curLevel[this.mode] >= 15) {
-            this.unlockMode(Mode.gs)
-        } else if (this.mode === Mode.gs && this.curLevel[this.mode] >= 10) {
-            this.unlockMode(Mode.ls)
-        }
+        // if (this.mode === Mode.tp && this.curLevel[this.mode] >= 15) {
+        //     this.unlockMode(Mode.gs)
+        // } else if (this.mode === Mode.gs && this.curLevel[this.mode] >= 10) {
+        //     this.unlockMode(Mode.ls)
+        // }
     }
 
     public static quitGame(): void {

+ 2 - 1
assets/scripts/uiItem/MainItem.ts

@@ -13,7 +13,7 @@ export class MainItem extends Component {
     private tip: Node = null
 
     @property({ type: Enum(Mode) })
-    public mode: Mode = Mode.tp
+    public mode: Mode = Mode.ls
 
     private btnStart: Node = null
     private btnUnlock: Node = null
@@ -37,6 +37,7 @@ export class MainItem extends Component {
         TransMgr.Inst.fadeOut()
         UIMgr.close(UI.Main)
         GameMgr.mode = this.mode
+        GameMgr.mode = Mode.ls
         GameMgr.startGame()
     }