修复bug

assets/resources/data/guide_data.json

@@ -11,7 +11,7 @@
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "",
-		"lagNext": "1"
+		"lagNext": "0"
 	},
 	{
 		"id": "1_2",
@@ -25,7 +25,7 @@
 		"displayRect": "",
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
 		"finger": "100:20",
-		"lagNext": "0"
+		"lagNext": "1"
 	},
 	{
 		"id": "2_1",

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

@@ -1514,7 +1514,7 @@
       "__id__": 3
     },
     "open_effect": 1,
-    "isOpenCloseEffect": true,
+    "isOpenCloseEffect": false,
     "close_effect": 1,
     "close_toPoint": "",
     "close_uibg": false,

assets/resources/game/texture/coin/1.png.meta

@@ -7,13 +7,13 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 47,
-  "height": 51,
+  "width": 80,
+  "height": 94,
   "platformSettings": {},
   "subMetas": {
     "1": {
       "ver": "1.0.4",
-      "uuid": "487aa335-4ecc-49fd-a6d9-65ce8e276d0f",
+      "uuid": "49468ee8-f465-4b05-9c1c-a2134879d060",
       "rawTextureUuid": "7fcbfa5b-f738-4989-ac5a-e2066a7db637",
       "trimType": "auto",
       "trimThreshold": 1,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 47,
-      "height": 51,
-      "rawWidth": 47,
-      "rawHeight": 51,
+      "width": 80,
+      "height": 94,
+      "rawWidth": 80,
+      "rawHeight": 94,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/coin/4.png.meta

@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 64,
-      "height": 71,
-      "rawWidth": 64,
-      "rawHeight": 71,
+      "offsetX": 23,
+      "offsetY": 17,
+      "trimX": 61,
+      "trimY": 26,
+      "width": 122,
+      "height": 202,
+      "rawWidth": 198,
+      "rawHeight": 288,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/login/agreementTip.prefab

@@ -2074,8 +2074,8 @@
       "__id__": 2
     },
     "open_effect": 1,
-    "isOpenCloseEffect": true,
-    "close_effect": 1,
+    "isOpenCloseEffect": false,
+    "close_effect": 0,
     "close_toPoint": "",
     "close_uibg": false,
     "isDelayOneFrame": false,

assets/resources/module/reward/spine.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "0b3ddea9-edbb-4992-9775-a827c2ff9e06",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/reward/spine/hb_star.atlas

@@ -1,13 +0,0 @@
-
-hb_star.png
-size: 18,20
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-xing
-  rotate: false
-  xy: 2, 2
-  size: 14, 16
-  orig: 16, 18
-  offset: 1, 1
-  index: -1

assets/resources/module/reward/spine/hb_star.atlas.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "1.0.1",
-  "uuid": "e7f6e717-3b33-4873-8935-75a27a306cb3",
-  "subMetas": {}
-}

assets/resources/module/reward/spine/hb_star.json

@@ -1,344 +0,0 @@
-{
-"skeleton": {
-	"hash": "YIpORjrjMBx3POI9KjpTQORgSWg",
-	"spine": "3.8.99",
-	"x": -301.83,
-	"y": 39.82,
-	"width": 527.04,
-	"height": 450.45,
-	"images": "",
-	"audio": ""
-},
-"bones": [
-	{ "name": "root" },
-	{ "name": "xing", "parent": "root", "x": 191.89, "y": 329.46 },
-	{ "name": "xing2", "parent": "root", "x": -158.11, "y": 138.71, "scaleX": 0.5659, "scaleY": 0.5659 },
-	{ "name": "xing3", "parent": "root", "x": 130.64, "y": 75.71 },
-	{ "name": "xing4", "parent": "root", "x": -220.28, "y": 411.45, "scaleX": 0.5629, "scaleY": 0.5629 },
-	{ "name": "xing5", "parent": "root", "x": -264.86, "y": 341.71 },
-	{ "name": "xing6", "parent": "root", "x": 130.64, "y": 465.96, "scaleX": 0.5629, "scaleY": 0.5629 },
-	{ "name": "xing7", "parent": "root", "x": 31.27, "y": 174.21, "scaleX": 0.5629, "scaleY": 0.5629 },
-	{ "name": "xing8", "parent": "root", "x": -34.98, "y": 300.34, "scaleX": 0.5629, "scaleY": 0.5629 }
-],
-"slots": [
-	{ "name": "xing", "bone": "xing", "attachment": "xing" },
-	{ "name": "xing2", "bone": "xing2", "attachment": "xing" },
-	{ "name": "xing3", "bone": "xing3", "attachment": "xing" },
-	{ "name": "xing4", "bone": "xing4", "attachment": "xing" },
-	{ "name": "xing6", "bone": "xing6", "attachment": "xing" },
-	{ "name": "xing7", "bone": "xing7", "attachment": "xing" },
-	{ "name": "xing8", "bone": "xing8", "attachment": "xing" },
-	{ "name": "xing5", "bone": "xing5", "attachment": "xing" }
-],
-"skins": [
-	{
-		"name": "default",
-		"attachments": {
-			"xing": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing2": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing3": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing4": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing5": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing6": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing7": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			},
-			"xing8": {
-				"xing": { "x": -1.82, "y": 3.65, "scaleX": 4.3928, "scaleY": 4.3928, "width": 16, "height": 18 }
-			}
-		}
-	}
-],
-"animations": {
-	"animation": {
-		"slots": {
-			"xing": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing2": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing3": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing4": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing5": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing6": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing7": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			},
-			"xing8": {
-				"color": [
-					{ "color": "ffffff00" },
-					{ "time": 0.3333, "color": "ffffffff" },
-					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ffffff00" }
-				]
-			}
-		},
-		"bones": {
-			"xing": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing2": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing3": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing4": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing5": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing6": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing7": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			},
-			"xing8": {
-				"rotate": [
-					{},
-					{ "time": 0.3333, "angle": -94.71 },
-					{ "time": 0.6333, "angle": 159.72 },
-					{ "time": 0.6667 },
-					{ "time": 1, "angle": -94.71 },
-					{ "time": 1.3, "angle": 159.72 },
-					{ "time": 1.3333 }
-				],
-				"translate": [
-					{ "curve": "stepped" },
-					{ "time": 0.3333, "curve": "stepped" },
-					{ "time": 0.6667, "curve": "stepped" },
-					{ "time": 1, "curve": "stepped" },
-					{ "time": 1.3333 }
-				],
-				"scale": [
-					{ "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.3333, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 0.6667, "x": 0.737, "y": 0.737, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1, "x": 1.743, "y": 1.743, "curve": 0.25, "c3": 0.75 },
-					{ "time": 1.3333, "x": 0.737, "y": 0.737 }
-				]
-			}
-		}
-	}
-}
-}

assets/resources/module/reward/spine/hb_star.json.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.3",
-  "uuid": "4ff19fc9-047e-44b1-aac9-98904d537eb9",
-  "textures": [
-    "a546159c-493d-4b57-83f5-e290fed7ec9e"
-  ],
-  "scale": 1,
-  "subMetas": {}
-}

assets/resources/module/reward/spine/hb_star.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "a546159c-493d-4b57-83f5-e290fed7ec9e",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 18,
-  "height": 20,
-  "platformSettings": {},
-  "subMetas": {
-    "hb_star": {
-      "ver": "1.0.4",
-      "uuid": "4153cb9e-8c15-4b0a-a003-3a48893c1a9b",
-      "rawTextureUuid": "a546159c-493d-4b57-83f5-e290fed7ec9e",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 2,
-      "trimY": 2,
-      "width": 14,
-      "height": 16,
-      "rawWidth": 18,
-      "rawHeight": 20,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/script/before/view/data/ADUnlockData.ts

@@ -22,6 +22,8 @@ export default class ADUnlockData extends Data {
             let farmNext = gData.gameData.getFarmDataMap(this.curConfigID + 1);
             farmNext.state = FarmState.CanUnlock;
             gData.gameData.setFarmDataMap(this.curConfigID + 1, farmNext);
+
+            mk.tip.pop('拓建农田成功');
         }
         else {
             gData.gameData.setFarmDataMap(this.curConfigID, farm);

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

@@ -10,9 +10,9 @@ export default class ADUnlockPanel extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
+                mk.ui.closePanel(this.node.name);
                 gData.adData.watchVideo(null);
                 gData.adUnlockData.unlockFarm();
-                mk.ui.closePanel(this.node.name);
             }
         });
     }

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

@@ -55,7 +55,7 @@ export default class HarvestPanel extends cc.Component {
             gData.harvestData.init_reward = false;
 
             //奖励弹窗
-            gData.reward.data = gData.harvestData.adData;
+            gData.reward.adData = gData.harvestData.adData;
             gData.reward.callback = gData.harvestData.call;
             mk.ui.openPanel('module/reward/reward');
 

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

@@ -98,6 +98,11 @@ export default class PlantItem extends cc.Component {
     }
 
     clickMake() {
+        if (gData.gameData.leftTimes <= 0) {
+            mk.ui.openPanel('module/speedUpUI/productReward');
+            return;
+        }
+
         if (this.data.tab == ProductType.nzw) {
             gData.farmSystem.plant(this.data.picture);
             gData.farmSystem.selectNextFarm(false);

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -27,7 +27,7 @@ export default class EffectOpenAndClose extends cc.Component {
     private open_effect: EffectType = EffectType.scale;
 
     @property({ displayName: '是否打开关闭动画' })
-    private isOpenCloseEffect: boolean = true;
+    public isOpenCloseEffect: boolean = true;
     @property({ type: cc.Enum(EffectType), displayName: '关闭动画节点效果', visible() { return this.effect_par && this.isOpenCloseEffect } })
     private close_effect: EffectType = EffectType.scale;
 

assets/script/game/data/AdData.ts

@@ -400,4 +400,5 @@ export enum AdFun {
     cashOutNoviceWelfare = 7, //钱包提现新手福利视频
     cashOutAddCash = 8, //钱包提现加现金视频
     harvest = 9,        //收获超级加倍视频
+    farmMap = 10,       //图鉴领取视频
 }

assets/script/game/data/GameData.ts

@@ -1177,6 +1177,8 @@ export enum RewardType {
     rmb = 2,
     /** 金猪币 */
     pigRmb = 3,
+    /** 生产次数 */
+    productTimes = 4,
 }
 
 /**

assets/script/game/data/module/FarmMapData.ts

@@ -6,20 +6,25 @@ import { Data } from "../../../mk/data/Data";
 import { ProductType } from "../GameData";
 
 
-export class FarmMapData extends Data{
+export class FarmMapData extends Data {
 
     public chooseType: ProductType = ProductType.nzw;
     public maxUnluckValue: any;
 
-    public isStateChange:boolean = false;
+    public isStateChange: boolean = false;
 
-    init()
-    {
-        
+    public init_award = false;
+
+    init() {
+
+    }
+
+    setAdData(data) {
+        super.setAdData(data);
+        this.init_award = true;
     }
 
-    setChooseType(t: ProductType)
-    {
+    setChooseType(t: ProductType) {
         this.chooseType = t;
         this.maxUnluckValue = gData.gameData.getMaxProduct(t);
     }

assets/script/game/data/module/RewardData.ts

@@ -54,12 +54,11 @@ export class RewardData extends Data {
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
-            if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
+            if (gData.reward.data[i].rewardType === RewardType.rmb || gData.reward.data[i].rewardType === RewardType.productTimes) continue;
             if (gData.reward.data[i].rewardNum == 0) continue;
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, world_Pos, '', () => {
                 is_add_money && this.addReward();
             })
         }
-
     }
 }

assets/script/game/game/Game.ts

@@ -64,9 +64,6 @@ export default class Game extends cc.Component {
     onLoad() {
         this.ani_add.node.active = false;
         gData.gameData.gameStyle = this;
-        mk.ui.closePanel("login", () => {
-            mk.ui.closePanel("agreementTip");
-        });
         this.span = gData.gameData.ProductionRecovery * 60 * 1000;
         gData.gameData.checkGradeUpUnLock();
         this.loadMain();
@@ -231,19 +228,16 @@ export default class Game extends cc.Component {
         this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
         let isShow = false;
         let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList;
-        if(data)
-        {     
+        if (data) {
             let len = data.length;
-            for(let i = 0; i != len; ++i)
-            {
-                if(data[i].status == 1)
-                {
+            for (let i = 0; i != len; ++i) {
+                if (data[i].status == 1) {
                     isShow = true;
                     break;
                 }
             }
         }
-        this.nodeRedPoint.node_gradeReward.active = isShow;  
+        this.nodeRedPoint.node_gradeReward.active = isShow;
     }
 
     /**

assets/script/game/module/agreementTip/agreementTip.ts

@@ -7,15 +7,6 @@ const { ccclass, property } = cc._decorator;
  */
 @ccclass
 export default class agreementTip extends cc.Component {
-
-    // @property({ displayName: '同意按钮', type: cc.Button })
-    // private btnAgree: cc.Button = null;
-    // onLoad () {}
-
-    start() {
-
-    }
-
     /**
      * 点击协议按钮
      * @param data 协议类型
@@ -24,16 +15,8 @@ export default class agreementTip extends cc.Component {
         gData.setting.rule_type = parseInt(data);
     }
 
-    /**
-     * 关闭面板
-     */
-    private clickClose() {
-        mk.ui.closePanel(this.node.name);
-    }
-
     private clickAgree() {
         let node = cc.find('Canvas/主界面层');
-        mk.ui.openPanel("game/prefab/game", OpenActionType.normal, node);
+        mk.ui.openPanel("game/prefab/game", OpenActionType.closeOther, node);
     }
-    // update (dt) {}
 }

assets/script/game/module/farmMap/FarmItem.ts

@@ -1,3 +1,4 @@
+import { AdFun } from "../../data/AdData";
 import { ProductType, VideoAdType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
@@ -158,7 +159,8 @@ export default class FarmItem extends cc.Component {
         mk.ad.videoAdType = VideoAdType.video_init_6;
         mk.ad.watchAd((success) => {
             if (success) {
-                gData.adData.watchVideo(null);
+                gData.adData.watchVideo(AdFun.farmMap);
+                
                 gData.farmMapData.isStateChange = true;
                 this.node_getBtn.active = true;
                 this.node_ungetBtn.active = false;

assets/script/game/module/farmMap/FarmMap.ts

@@ -89,6 +89,12 @@ export default class FarmMap extends cc.Component {
             this.refreshBtnState();
             gData.farmMapData.isStateChange = false;
         }
+
+        if (gData.farmMapData.init_award) {
+            gData.farmMapData.init_award = false;
+            gData.reward.data = gData.farmMapData.adData;
+            mk.ui.openPanel('module/reward/reward');
+        }
     }
 
     getIndex(data) {

assets/script/game/module/login/Login.ts

@@ -93,7 +93,7 @@ export default class Login extends cc.Component {
                 }
                 else {
                     let node = cc.find('Canvas/主界面层');
-                    mk.ui.openPanel("game/prefab/game", OpenActionType.normal, node);
+                    mk.ui.openPanel("game/prefab/game", OpenActionType.closeOther, node);
                     console.log("===[Jsbsystem 显示开屏广告================================")
                     if (mk.ad.ifShowAd) {
                         JsbSystem.showSplash();

assets/script/game/module/reward/Reward.ts

@@ -19,32 +19,6 @@ enum LidType {
  */
 @ccclass
 export default class Reward extends cc.Component {
-
-
-    @property({ displayName: '红包类型', type: cc.Enum(LidType), tooltip: 'none无类型，luck幸运红包，mission通关红包' })
-    private lid_type: LidType = LidType.none;
-    @property({ displayName: '幸运红包', type: cc.Node })
-    private node_luck: cc.Node = null;
-    @property({ displayName: '通关红包', type: cc.Node })
-    private node_mission: cc.Node = null;
-    @property({ displayName: '开红包动画', type: cc.Animation })
-    private anim_open_redbag: cc.Animation = null;
-    @property({ displayName: '按钮看视频', type: cc.Button })
-    private btn_watch_video: cc.Button = null;
-    // @property({ displayName: '红包图标', type: cc.Node })
-    // private node_redBag: cc.Node = null;
-    // @property({ displayName: '金猪图标', type: cc.Node })
-    // private node_pig: cc.Node = null;
-    @property({ displayName: '货币图标', type: cc.Sprite })
-    private node_coin: cc.Sprite = null;
-    @property({ displayName: '奖励数量', type: cc.Label })
-    private lbl_reward_value: cc.Label = null;
-    @property({ displayName: '星星闪闪效果', type: cc.Node })
-    private hb_star: cc.Node = null;
-    @property({ displayName: '关闭按钮', type: cc.Node })
-    private btn_close: cc.Node = null;
-
-
     // 底部提现相关
     @property({ displayName: 'spr提现进度', type: cc.Sprite })
     private spr_cash_out: cc.Sprite = null;
@@ -61,25 +35,19 @@ export default class Reward extends cc.Component {
     @property({ displayName: '新红包奖励数量', type: cc.Label })
     private lbl_reward_num: cc.Label = null;
 
-    @property({ displayName: '红包节点', type: cc.Node })
-    private node_hb: cc.Node = null;
-
-
+    @property({ displayName: '红包节点', type: cc.Sprite })
+    private node_hb: cc.Sprite = null;
 
     /** 当前阶段 */
     private cur_stage: number = LidType.none;
 
     onLoad() {
-        this.hb_star.active = false;
-        this.lbl_reward_value.string = '0';
-
         this.lbl_reward_num.string = 'x0';
         // gData.reward.data = [{ rewardType: 3, rewardNum: 100 }]// 测试数据
+        this.watchVideoCall();
     }
 
     start() {
-        /** 盖子 */
-        this.initLid();
         // gData.gameData.gameData.redMoney = 1500;// 测试数据
         this.initCashOutStyle(gData.gameData.gameData.redMoney);
     }
@@ -111,30 +79,6 @@ export default class Reward extends cc.Component {
     }
 
     /**
-     * 初始化封面样式
-     */
-    private initLid() {
-        if (this.lid_type === LidType.none) {// 无盖子样式
-            this.node_luck.active = false;
-            this.node_mission.active = false;
-            this.btn_watch_video.node.active = false;
-            this.watchVideoCall();
-        } else if (this.lid_type === LidType.luck) {
-            this.node_luck.active = true;
-            this.node_mission.active = false;
-            this.btn_watch_video.node.active = true;
-            this.cur_stage = LidType.luck;
-            mk.audio.playEffect("reward");
-        } else if (this.lid_type === LidType.mission) {
-            this.node_luck.active = false;
-            this.node_mission.active = true;
-            this.btn_watch_video.node.active = true;
-            this.cur_stage = LidType.mission;
-            mk.audio.playEffect("reward");
-        }
-    }
-
-    /**
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
@@ -155,44 +99,6 @@ export default class Reward extends cc.Component {
     }
 
     /**
-     * 看广告
-     */
-    private async clickWatchVideo() {
-        cc.log('看广告请求');
-        if (gData.gameData.gameData.isFirstRedMoney) {
-            gData.gameData.gameData.isFirstRedMoney = 0;
-            // 用户第一次看此视频时，可不需要看直接领取奖励
-            let response = await mk.http.sendData('getFreeRedMoney', {});
-            if (response.errcode != 0) {
-                mk.tip.pop(response.errmsg);
-                return;
-            }
-            gData.reward.adData = {}
-            gData.reward.adData.videoRedMoney = {}
-            gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: RewardType.redBag, rewardNum: response.data.freeRedMoney }]
-            return;
-        }
-        if (this.lid_type === LidType.mission) {
-            // 关卡结算红包
-            mk.ad.watchAd((success: boolean) => {
-                mk.console.log("watchAD:" + success);
-                if (success) {
-                    gData.adData.watchVideo(AdFun.settlement);
-                }
-            });
-        } else {
-            mk.ad.watchAd((success: boolean) => {
-                mk.console.log("watchAD:" + success);
-                if (success) {
-                    gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
-                    //FC:不需要置空
-                    // gData.reward.subType = null;
-                }
-            });
-        }
-    }
-
-    /**
      * 看广告回调：开奖
      */
     private async watchVideoCall() {
@@ -202,11 +108,6 @@ export default class Reward extends cc.Component {
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
-        this.btn_close && (this.btn_close.active = false);
-        //mk.audio.playEffect("rewardOpen");
-        // this.hb_star.active = true;
-        // this.hb_star.getComponent(sp.Skeleton).animation = 'animation';
-        // this.hb_star.getComponent(sp.Skeleton).loop = false;
         this.cur_stage = LidType.none;
 
         // 数据排序：多条奖励，只展示红包，把红包放在首位
@@ -222,30 +123,18 @@ export default class Reward extends cc.Component {
         }
 
         // 图标展示
-        if (gData.reward.data[0].rewardType === RewardType.redBag) {
-            this.node_coin.spriteFrame = await mk.loader.load('game/texture/coin/' + RewardType.redBag, cc.SpriteFrame);
-            // this.node_redBag.active = true;
-            // this.node_pig.active = false;
+        this.node_hb.spriteFrame = await mk.loader.load('game/texture/coin/' + gData.reward.data[0].rewardType, cc.SpriteFrame);
+        if (gData.reward.data[0].rewardType === RewardType.productTimes) {
+            this.node_hb.node.scale = 0.5;
         } else {
-            this.node_coin.spriteFrame = await mk.loader.load('game/texture/coin/' + gData.reward.data[0].rewardType, cc.SpriteFrame);
-            // this.node_redBag.active = false;
-            // this.node_pig.active = true;
+            this.node_hb.node.scale = 1;
         }
         let rewardNum: number = gData.reward.data[0].rewardNum || 0;
         if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
-            this.lbl_reward_value.string = (rewardNum / 100).toFixed(2) + '元';
         } else {
-            this.lbl_reward_value.string = `${rewardNum}`;
-
             this.lbl_reward_num.string = `x${rewardNum}`;
         }
 
-        // 动画
-        this.anim_open_redbag.play();
-        this.node_luck.active = false;
-        this.node_mission.active = false;
-        this.btn_watch_video.node.active = false;
-
         // 底部进度动画
         if (gData.reward.data[0].rewardType === RewardType.redBag) {
             gData.reward.add_redbag_value = gData.reward.data[0].rewardNum;
@@ -257,7 +146,7 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         cc.log('获取奖励：', gData.reward.data);
-        let world_Pos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
+        let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);
         if (gData.reward.callback) {
             gData.reward.callback();

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -23,11 +23,19 @@ export default class ProductReward extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             if (success) {
                 gData.adData.watchVideo(null);
-                gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
+
+                let rewardData = [{ rewardType: 4, rewardNum: parseInt(gData.gameData.configs.ServerConfig.ProductionAd) }];
+                gData.reward.data = rewardData;
+                gData.reward.callback = this.addTimes;
+                mk.ui.openPanel('module/reward/reward');
             }
         })
     }
 
+    addTimes() {
+        gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
+    }
+
     private clickCloseBtn() {
         mk.audio.playEffect("closeButton");
         mk.ui.closePanel(this.node.name);

assets/script/mk/system/UISystem.ts

@@ -10,9 +10,9 @@ export default class UISystem extends cc.Component {
     /** panel父节点 */
     private panelParent: cc.Node = null;
     /** 是否正在打开界面 */
-    private isPanelOpening: boolean = false;
+    private isPanelOpeningArr = [];
     /** 是否界面正在关闭 */
-    private isPanelClosing: boolean = false;
+    private isPanelClosingArr = [];
     /** 当前打开的UIPanel */
     private curOnPanelDic: { [key: string]: cc.Node } = {};
     /** 上一个打开的界面名称 */
@@ -38,11 +38,11 @@ export default class UISystem extends cc.Component {
         let panelName = arr[arr.length - 1];
 
         let self = this;
-        if (self.isPanelOpening || self.getCurOnPanel(panelName)) {
+        if (self.isPanelOpeningArr.indexOf(panelName) != -1 || self.getCurOnPanel(panelName)) {
             return;
         }
 
-        self.isPanelOpening = true;
+        self.isPanelOpeningArr.push(panelName);
 
         return new Promise((resolve, reject) => {
 
@@ -58,7 +58,8 @@ export default class UISystem extends cc.Component {
                     //如果父节点不存在，就默认把该节点定为panel的父节点
                     if (!self.panelParent) {
                         console.error("[UISystem] UI的父节点panelParent为null,请检查脚本挂载情况");
-                        self.isPanelOpening = false;
+                        let index = self.isPanelOpeningArr.indexOf(panelName);
+                        self.isPanelOpeningArr.splice(index, 1);
                         return;
                     }
 
@@ -78,7 +79,7 @@ export default class UISystem extends cc.Component {
                             }
                             break;
                         case OpenActionType.closeOther:
-                            let keys = Object.keys(self.curOnPanelDic).filter((key) => { key != panelName });
+                            let keys = Object.keys(self.curOnPanelDic).filter((key) => { return key != panelName });
                             for (var i = 0; i < keys.length; i++) {
                                 let key = keys[i];
                                 self.closePanel(key);
@@ -91,10 +92,12 @@ export default class UISystem extends cc.Component {
                     //返回panel
                     resolve(node_panel);
 
-                    self.isPanelOpening = false;
+                    let index = self.isPanelOpeningArr.indexOf(panelName);
+                    self.isPanelOpeningArr.splice(index, 1);
                 })
                 .catch((err) => {
-                    self.isPanelOpening = false;
+                    let index = self.isPanelOpeningArr.indexOf(panelName);
+                    self.isPanelOpeningArr.splice(index, 1);
                     reject(err);
                 })
         });
@@ -114,16 +117,16 @@ export default class UISystem extends cc.Component {
      * @param callBack  关闭之后回调
      */
     closePanel(panelName: string, callBack: Function = null) {
-        if (this.isPanelClosing || !this.getCurOnPanel(panelName)) {
+        if (this.isPanelClosingArr.indexOf(panelName) != -1 || !this.getCurOnPanel(panelName)) {
             return;
         }
-        this.isPanelClosing = true;
+        this.isPanelClosingArr.push(panelName);
 
         let node_panel = this.getCurOnPanel(panelName);
 
         // 是否存在关闭动画
         let comp_anim = node_panel.getComponent('EffectOpenAndClose');
-        if (comp_anim) {
+        if (comp_anim && comp_anim.isOpenCloseEffect) {
             comp_anim.hideEffect(this.destroyNode.bind(this, node_panel, panelName, callBack));
         } else {
             this.destroyNode(node_panel, panelName, callBack);
@@ -134,7 +137,8 @@ export default class UISystem extends cc.Component {
     private destroyNode(node_panel, panelName, callBack = null) {
         node_panel.destroy();
         delete this.curOnPanelDic[panelName];
-        this.isPanelClosing = false;
+        let index = this.isPanelClosingArr.indexOf(panelName);
+        this.isPanelClosingArr.splice(index, 1);
         callBack && callBack();
     }
 
@@ -157,7 +161,6 @@ export default class UISystem extends cc.Component {
             mk.event.emit('close-panel', panelName);
         }
 
-        this.isPanelClosing = false;
         mk.ad.destroyNativeAd()
         mk.ad.destoryBanner()
     }