界面优化

assets/resources/game/prefab/uiItem/PlantItem.prefab

@@ -110,7 +110,7 @@
         "__id__": 44
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 52

assets/resources/game/prefab/uiPanel/ADClearSickPanel.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 33
-      },
-      {
         "__id__": 34
       },
       {
-        "__id__": 36
+        "__id__": 35
       },
       {
         "__id__": 37
+      },
+      {
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -764,14 +764,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -929,7 +929,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "add_window_btn_byte_0",
+    "_name": "按钮文本",
     "_objFlags": 0,
     "_parent": {
       "__id__": 20
@@ -939,23 +939,26 @@
     "_components": [
       {
         "__id__": 25
+      },
+      {
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 253,
       "g": 255,
-      "b": 255,
+      "b": 229,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 139,
-      "height": 37
+      "width": 150,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -967,7 +970,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -5.362,
         0,
         0,
         0,
@@ -992,7 +995,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1006,21 +1009,40 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "599485e0-1c8e-4e85-bd06-3d33b766c276"
+    "_string": "消灭害虫",
+    "_N$string": "消灭害虫",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
     },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 182,
+      "g": 100,
+      "b": 19,
+      "a": 255
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1080,7 +1102,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_N$interactable": true,
@@ -1248,7 +1270,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_id": ""
@@ -1299,6 +1321,9 @@
     "sp": {
       "__id__": 16
     },
+    "labBtn": {
+      "__id__": 25
+    },
     "_id": ""
   },
   {

assets/resources/game/prefab/uiPanel/ADUnlockPanel.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 33
-      },
-      {
         "__id__": 34
       },
       {
-        "__id__": 36
+        "__id__": 35
       },
       {
         "__id__": 37
+      },
+      {
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -429,7 +429,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 162,
+      "width": 202,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -442,7 +442,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        116,
+        -36.77,
         0,
         0,
         0,
@@ -481,8 +481,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "立即获得",
-    "_N$string": "立即获得",
+    "_string": "拓建新农田",
+    "_N$string": "拓建新农田",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -572,7 +572,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        69.943,
         0,
         0,
         0,
@@ -764,14 +764,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -939,23 +939,26 @@
     "_components": [
       {
         "__id__": 25
+      },
+      {
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 253,
       "g": 255,
-      "b": 255,
+      "b": 229,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 139,
-      "height": 37
+      "width": 150,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -967,7 +970,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -4.522,
         0,
         0,
         0,
@@ -992,7 +995,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1006,21 +1009,40 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "599485e0-1c8e-4e85-bd06-3d33b766c276"
+    "_string": "立即拓建",
+    "_N$string": "立即拓建",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
     },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 182,
+      "g": 100,
+      "b": 19,
+      "a": 255
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1080,7 +1102,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_N$interactable": true,
@@ -1248,7 +1270,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_id": ""
@@ -1285,8 +1307,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/script/before/main/FarmCountDown.ts

@@ -93,7 +93,7 @@ export class FarmCountDown extends cc.Component {
     private riped(): void {
         this.counting = false;
         this.normalGroup.active = false;
-        if (Math.random() < 0.4) {
+        if (Math.random() < 0.2) {
             this.sickIcon.active = true;
             this.onSick && this.onSick.emit(null);
         }

assets/script/before/main/FarmIcon.ts

@@ -103,7 +103,7 @@ export class FarmIcon extends cc.Component {
     public async onTouch() {
         switch (this.data.state) {
             case FarmState.Lock:
-                mk.tip.pop(`请先解锁扩建农田`);
+                mk.tip.pop(`点击拓建即可解锁农田`);
                 break;
             case FarmState.CanUnlock:
                 gData.adUnlockData.openPanel(this.configID);

assets/script/before/view/ui/ADClearSickPanel.ts

@@ -9,22 +9,26 @@ export default class ADClearSickPanel extends cc.Component {
     @property({ type: cc.Label, tooltip: "标题" }) labTitle: cc.Label = null;
     @property({ type: cc.Label, tooltip: "描述" }) labDes: cc.Label = null;
     @property({ type: cc.Sprite, tooltip: "故障图标" }) sp: cc.Sprite = null;
+    @property({ type: cc.Label, tooltip: "按钮文字" }) labBtn: cc.Label = null;
 
     async onLoad() {
         switch (gData.adClearSickData.tab) {
             case ProductType.nzw:
-                this.labTitle.string = '农作物生虫了';
+                this.labTitle.string = '农作物生虫了，无法收获';
                 this.labDes.string = '看视频消灭害虫';
+                this.labBtn.string = '消灭害虫';
                 this.sp.spriteFrame = await mk.loader.load('game/coregame/texture/warning/warning_1', cc.SpriteFrame);
                 break;
             case ProductType.dw:
-                this.labTitle.string = '动物生病了';
-                this.labDes.string = '看视频治疗动物';
+                this.labTitle.string = '动物生病了，无法收获';
+                this.labDes.string = '看视频恢复健康';
+                this.labBtn.string = '恢复健康';
                 this.sp.spriteFrame = await mk.loader.load('game/coregame/texture/warning/warning_2', cc.SpriteFrame);
                 break;
             default:
-                this.labTitle.string = '工厂出故障了';
-                this.labDes.string = '看视频修复工厂';
+                this.labTitle.string = '商铺停电了，无法收获';
+                this.labDes.string = '看视频恢复供电';
+                this.labBtn.string = '恢复供电';
                 this.sp.spriteFrame = await mk.loader.load('game/coregame/texture/warning/warning_3', cc.SpriteFrame);
                 break;
         }

assets/script/before/view/uiItem/PlantItem.ts

@@ -66,7 +66,7 @@ export default class PlantItem extends cc.Component {
             let des = this.getDesByType();
             let plantName = gData.gameData.getProductMap(this.data.picture - 1).name;
             if (list_data.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
-                this.labUnlock.string = `${des}${this.data.value}次(${times}/${this.data.value})\n${plantName}`;
+                this.labUnlock.string = `${times}/${this.data.value}\n${des}${this.data.value}次\n${plantName}`;
                 this.labUnlock.node.active = true;
             }
             else {

assets/script/game/data/GameData.ts

@@ -333,10 +333,10 @@ export class GameData {
             let id = 31000;
             let data = null;
             for (var i = 0; i < 18; i++) {
-                if (i < 3) {
+                if (i < 6) {
                     data = { id: id, state: FarmState.Empty, productID: 0, growSpan: 0 };
                 }
-                else if (i == 3) {
+                else if (i == 6) {
                     data = { id: id, state: FarmState.CanUnlock, productID: 0, growSpan: 0 };
                 }
                 else {