主界面替换

assets/bundles/game/image/+.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "48a58583-d124-422d-b2c5-969f1e89c79a",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "48a58583-d124-422d-b2c5-969f1e89c79a@6c48a",
+      "displayName": "+",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "48a58583-d124-422d-b2c5-969f1e89c79a",
+        "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": "48a58583-d124-422d-b2c5-969f1e89c79a@f9941",
+      "displayName": "+",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 29,
+        "height": 26,
+        "rawWidth": 29,
+        "rawHeight": 26,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -14.5,
+            -13,
+            0,
+            14.5,
+            -13,
+            0,
+            -14.5,
+            13,
+            0,
+            14.5,
+            13,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            26,
+            29,
+            26,
+            0,
+            0,
+            29,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -14.5,
+            -13,
+            0
+          ],
+          "maxPos": [
+            14.5,
+            13,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "48a58583-d124-422d-b2c5-969f1e89c79a@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "48a58583-d124-422d-b2c5-969f1e89c79a@6c48a"
+  }
+}

assets/bundles/game/image/bg_farm.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a",
+      "displayName": "bg_farm",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5",
+        "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": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@f9941",
+      "displayName": "bg_farm",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 1600,
+        "rawWidth": 720,
+        "rawHeight": 1600,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -800,
+            0,
+            360,
+            -800,
+            0,
+            -360,
+            800,
+            0,
+            360,
+            800,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1600,
+            720,
+            1600,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -800,
+            0
+          ],
+          "maxPos": [
+            360,
+            800,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "859a9d56-dad2-4ae1-8a90-5c912b7a5ca5@6c48a"
+  }
+}

assets/bundles/game/image/btn_bd.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

assets/bundles/game/image/btn_dp.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

assets/bundles/game/image/btn_hy.png.meta

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

assets/bundles/game/image/btn_sx.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 133,
-        "height": 129,
-        "rawWidth": 133,
-        "rawHeight": 129,
+        "width": 166,
+        "height": 148,
+        "rawWidth": 166,
+        "rawHeight": 148,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0,
-            66.5,
-            -64.5,
+            83,
+            -74,
             0,
-            -66.5,
-            64.5,
+            -83,
+            74,
             0,
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            129,
-            133,
-            129,
+            148,
+            166,
+            148,
             0,
             0,
-            133,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -66.5,
-            -64.5,
+            -83,
+            -74,
             0
           ],
           "maxPos": [
-            66.5,
-            64.5,
+            83,
+            74,
             0
           ]
         },

assets/bundles/game/image/lj.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 71,
-        "height": 35,
-        "rawWidth": 71,
-        "rawHeight": 35,
+        "width": 115,
+        "height": 32,
+        "rawWidth": 115,
+        "rawHeight": 32,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -35.5,
-            -17.5,
+            -57.5,
+            -16,
             0,
-            35.5,
-            -17.5,
+            57.5,
+            -16,
             0,
-            -35.5,
-            17.5,
+            -57.5,
+            16,
             0,
-            35.5,
-            17.5,
+            57.5,
+            16,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            35,
-            71,
-            35,
+            32,
+            115,
+            32,
             0,
             0,
-            71,
+            115,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -35.5,
-            -17.5,
+            -57.5,
+            -16,
             0
           ],
           "maxPos": [
-            35.5,
-            17.5,
+            57.5,
+            16,
             0
           ]
         },

assets/bundles/game/image/tip.png.meta

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

assets/bundles/ui/UIGame.prefab

@@ -22,26 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 22
+        "__id__": 41
       },
       {
-        "__id__": 35
+        "__id__": 70
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 88
       },
       {
-        "__id__": 52
+        "__id__": 90
       },
       {
-        "__id__": 54
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -95,8 +95,7 @@
     "fileId": "16guJqMb5Eup2r3IjuQlY8",
     "instance": {
       "__id__": 4
-    },
-    "targetOverrides": null
+    }
   },
   {
     "__type__": "cc.PrefabInstance",
@@ -113,17 +112,11 @@
       {
         "__id__": 7
       },
-      {
-        "__id__": 8
-      },
       {
         "__id__": 9
       },
       {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
+        "__id__": 11
       },
       {
         "__id__": 13
@@ -138,12 +131,36 @@
         "__id__": 19
       },
       {
-        "__id__": 20
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
       }
     ],
     "removedComponents": [
       {
-        "__id__": 21
+        "__id__": 40
       }
     ]
   },
@@ -166,22 +183,28 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 8
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -220,
+      "x": -192.008,
       "y": 724,
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 10
     },
     "propertyPath": [
       "_lrot"
@@ -194,10 +217,16 @@
       "w": 1
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 6
+      "__id__": 12
     },
     "propertyPath": [
       "_euler"
@@ -209,10 +238,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "16guJqMb5Eup2r3IjuQlY8"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 14
     },
     "propertyPath": [
       "_alignFlags"
@@ -228,17 +263,23 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 16
     },
     "propertyPath": [
       "_lockFlags"
     ],
     "value": 9
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 14
+      "__id__": 18
     },
     "propertyPath": [
       "_name"
@@ -254,7 +295,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 20
     },
     "propertyPath": [
       "clickEvents",
@@ -271,16 +312,22 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 16
+      "__id__": 22
     },
     "propertyPath": [
       "clickEvents",
       "0"
     ],
     "value": {
-      "__id__": 18
+      "__id__": 23
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8alSH/jBpNwLNNpOnspxKb"
+    ]
+  },
   {
     "__type__": "cc.ClickEvent",
     "target": {
@@ -294,23 +341,149 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 25
     },
     "propertyPath": [
       "_horizontalCenter"
     ],
-    "value": -220
+    "value": -192.008
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 11
+      "__id__": 27
     },
     "propertyPath": [
       "_top"
     ],
     "value": 45
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41xPDLpcBDyYi/KNss3WTO"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 29
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 121,
+      "height": 108
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "73ukzHkntOPYfHGh3oRUXD"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 31
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8ac9kyoU5LkLW39Opvt1zI"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 33
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 30,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "faBj9kU3hBa7mi5co6HxID"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 35
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 40.713,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8fnyHD4TRD+6Gq+AKR2hlU"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 37
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "68jM5C7VZNTaNkFa2/7Lk4"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 39
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 0
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "9adAmlzW1FR5eWPPqExv/J"
+    ]
+  },
   {
     "__type__": "cc.TargetInfo",
     "localID": [
@@ -324,14 +497,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 23
+      "__id__": 42
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 22
+      "__id__": 41
     },
     "asset": {
       "__uuid__": "7c472dc3-af09-4df4-a4f9-6678aebc66b0",
@@ -339,7 +512,7 @@
     },
     "fileId": "80B9Z+Ar1O7Z786kNWGrHv",
     "instance": {
-      "__id__": 24
+      "__id__": 43
     },
     "targetOverrides": null
   },
@@ -353,25 +526,55 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 25
+        "__id__": 44
       },
       {
-        "__id__": 27
+        "__id__": 46
       },
       {
-        "__id__": 28
+        "__id__": 47
+      },
+      {
+        "__id__": 48
       },
       {
-        "__id__": 29
+        "__id__": 49
       },
       {
-        "__id__": 30
+        "__id__": 51
       },
       {
-        "__id__": 32
+        "__id__": 53
       },
       {
-        "__id__": 34
+        "__id__": 54
+      },
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 60
+      },
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 67
+      },
+      {
+        "__id__": 69
       }
     ],
     "removedComponents": []
@@ -379,7 +582,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_name"
@@ -395,14 +598,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 74.961,
       "y": 724,
       "z": 0
     }
@@ -410,7 +613,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_lrot"
@@ -426,7 +629,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 26
+      "__id__": 45
     },
     "propertyPath": [
       "_euler"
@@ -441,7 +644,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 31
+      "__id__": 50
     },
     "propertyPath": [
       "_alignFlags"
@@ -457,7 +660,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 33
+      "__id__": 52
     },
     "propertyPath": [
       "_active"
@@ -473,13 +676,172 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 31
+      "__id__": 50
     },
     "propertyPath": [
       "_top"
     ],
     "value": 45
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 50
+    },
+    "propertyPath": [
+      "_lockFlags"
+    ],
+    "value": 8
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 50
+    },
+    "propertyPath": [
+      "_horizontalCenter"
+    ],
+    "value": 74.961
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 57
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 121,
+      "height": 108
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "daEOwjxKBGQKrJygYvy+EK"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 59
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "aaMD7Ej+FF+KxO26EfHBCh"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 61
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "9cp9Uqu2pH+LBPZtwBmpyI"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 63
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 30,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "74qTOGCV9KM5mJmgFhTkuv"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 65
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 40.798,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41t9QkAftFt5mQ1M+PadzD"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 52
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": -72.958,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 68
+    },
+    "propertyPath": [
+      "_type"
+    ],
+    "value": 1
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a7LdDTOEZISrlXsSsWaOht"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 68
+    },
+    "propertyPath": [
+      "_sizeMode"
+    ],
+    "value": 0
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -487,14 +849,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 36
+      "__id__": 71
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 35
+      "__id__": 70
     },
     "asset": {
       "__uuid__": "97df4867-ae74-48cf-a999-483cbac9cc6f",
@@ -502,7 +864,7 @@
     },
     "fileId": "f3Bka97HBLC70aYs8RpRDZ",
     "instance": {
-      "__id__": 37
+      "__id__": 72
     },
     "targetOverrides": null
   },
@@ -516,34 +878,40 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 38
+        "__id__": 73
       },
       {
-        "__id__": 40
+        "__id__": 75
       },
       {
-        "__id__": 41
+        "__id__": 76
       },
       {
-        "__id__": 42
+        "__id__": 77
       },
       {
-        "__id__": 43
+        "__id__": 78
       },
       {
-        "__id__": 45
+        "__id__": 80
       },
       {
-        "__id__": 46
+        "__id__": 81
       },
       {
-        "__id__": 47
+        "__id__": 82
       },
       {
-        "__id__": 48
+        "__id__": 83
       },
       {
-        "__id__": 49
+        "__id__": 84
+      },
+      {
+        "__id__": 85
+      },
+      {
+        "__id__": 86
       }
     ],
     "removedComponents": []
@@ -551,7 +919,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_name"
@@ -567,7 +935,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_lpos"
@@ -575,14 +943,14 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 220,
-      "y": 724,
+      "y": 1133.71,
       "z": 0
     }
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_lrot"
@@ -598,7 +966,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 39
+      "__id__": 74
     },
     "propertyPath": [
       "_euler"
@@ -613,7 +981,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_alignFlags"
@@ -629,17 +997,17 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_top"
     ],
-    "value": 45
+    "value": -369.21000000000004
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_left"
@@ -649,7 +1017,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_right"
@@ -659,23 +1027,53 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_lockFlags"
     ],
-    "value": 33
+    "value": 32
   },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 44
+      "__id__": 79
     },
     "propertyPath": [
       "_horizontalCenter"
     ],
     "value": 220
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 74
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 87
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 109,
+      "height": 71
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a5DChytv9Gc4whCvdJJJc0"
+    ]
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -686,7 +1084,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -714,7 +1112,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 91
     },
     "_alignFlags": 45,
     "_target": null,
@@ -750,7 +1148,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 93
     },
     "uiType": 0,
     "_id": ""
@@ -772,10 +1170,10 @@
     "targetOverrides": [],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 35
+        "__id__": 70
       },
       {
-        "__id__": 22
+        "__id__": 41
       },
       {
         "__id__": 2

assets/bundles/ui/common/dk1.png.meta

@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 159,
-        "height": 62,
-        "rawWidth": 159,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "width": 109,
+        "height": 71,
+        "rawWidth": 109,
+        "rawHeight": 71,
+        "borderTop": 30,
+        "borderBottom": 30,
+        "borderLeft": 40,
+        "borderRight": 40,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -79.5,
-            -31,
+            -54.5,
+            -35.5,
             0,
-            79.5,
-            -31,
+            54.5,
+            -35.5,
             0,
-            -79.5,
-            31,
+            -54.5,
+            35.5,
             0,
-            79.5,
-            31,
+            54.5,
+            35.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            62,
-            159,
-            62,
+            71,
+            109,
+            71,
             0,
             0,
-            159,
+            109,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -79.5,
-            -31,
+            -54.5,
+            -35.5,
             0
           ],
           "maxPos": [
-            79.5,
-            31,
+            54.5,
+            35.5,
             0
           ]
         },

assets/bundles/ui/common/nz.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": 72,
-        "height": 77,
-        "rawWidth": 73,
-        "rawHeight": 77,
+        "width": 121,
+        "height": 108,
+        "rawWidth": 121,
+        "rawHeight": 108,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -36,
-            -38.5,
+            -60.5,
+            -54,
             0,
-            36,
-            -38.5,
+            60.5,
+            -54,
             0,
-            -36,
-            38.5,
+            -60.5,
+            54,
             0,
-            36,
-            38.5,
+            60.5,
+            54,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            1,
-            77,
-            73,
-            77,
-            1,
             0,
-            73,
+            108,
+            121,
+            108,
+            0,
+            0,
+            121,
             0
           ],
           "nuv": [
-            0.0136986301369863,
+            0,
             0,
             1,
             0,
-            0.0136986301369863,
+            0,
             1,
             1,
             1
           ],
           "minPos": [
-            -36,
-            -38.5,
+            -60.5,
+            -54,
             0
           ],
           "maxPos": [
-            36,
-            38.5,
+            60.5,
+            54,
             0
           ]
         },

assets/scripts/game/Stage.ts

@@ -53,7 +53,8 @@ export class Stage extends Component {
     private isBusy: boolean = false
 
     protected onLoad(): void {
-        const bgName: string = 'bg_' + ModeName[GameMgr.mode]
+        // const bgName: string = 'bg_' + ModeName[GameMgr.mode]
+        const bgName: string = 'bg_' + 'farm'
         this.bg.spriteFrame = ResMgr.getSpriteFrame(Bundle.Game, bgName, 'image/')
 
         EventMgr.on(EventType.MergeGoods, this.onMergeGoods, this)

assets/scripts/ui/UIGame.ts

@@ -30,7 +30,7 @@ export class UIGame extends UIBase {
     }
 
     public onOpen(data?: any): void {
-        this.lbLevel.string = `第${GameMgr.CurLevel + 1}关`
+        this.lbLevel.string = `Level:${GameMgr.CurLevel + 1}`
         this.coinItem.init(CoinMgr.CurCoin)
         AudioMgr.playBgm(`游戏内音乐${math.randomRangeInt(0, 3)}`)
     }