Browse Source

Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

wuwangdong 4 years ago
parent
commit
415a707051
81 changed files with 4831 additions and 476 deletions
  1. 57 0
      assets/res/game/ani/faya.anim
  2. 5 0
      assets/res/game/ani/faya.anim.meta
  3. 61 0
      assets/res/game/ani/plant.anim
  4. 5 0
      assets/res/game/ani/plant.anim.meta
  5. 46 46
      assets/resources/game/coregame/configs/product.json
  6. 390 192
      assets/resources/game/coregame/coregame.prefab
  7. 12 0
      assets/resources/game/coregame/texture/Harvest.meta
  8. 12 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers.meta
  9. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/0.png
  10. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/0.png.meta
  11. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/1.png
  12. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/1.png.meta
  13. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/2.png
  14. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/2.png.meta
  15. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/3.png
  16. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/3.png.meta
  17. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/4.png
  18. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/4.png.meta
  19. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/5.png
  20. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/5.png.meta
  21. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/6.png
  22. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/6.png.meta
  23. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/7.png
  24. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/7.png.meta
  25. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/8.png
  26. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/8.png.meta
  27. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/9.png
  28. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/9.png.meta
  29. BIN
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/x.png
  30. 36 0
      assets/resources/game/coregame/texture/Harvest/getwindow_numbers/x.png.meta
  31. BIN
      assets/resources/game/coregame/texture/Harvest/harvest_byte_0.png
  32. 36 0
      assets/resources/game/coregame/texture/Harvest/harvest_byte_0.png.meta
  33. BIN
      assets/resources/game/coregame/texture/Harvest/harvest_byte_1.png
  34. 36 0
      assets/resources/game/coregame/texture/Harvest/harvest_byte_1.png.meta
  35. BIN
      assets/resources/game/coregame/texture/Harvest/harvest_byte_2.png
  36. 36 0
      assets/resources/game/coregame/texture/Harvest/harvest_byte_2.png.meta
  37. BIN
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_0.png
  38. 36 0
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_0.png.meta
  39. BIN
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_1.png
  40. 36 0
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_1.png.meta
  41. BIN
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_2.png
  42. 36 0
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_2.png.meta
  43. BIN
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_3.png
  44. 36 0
      assets/resources/game/coregame/texture/Harvest/hav_btn_byte_3.png.meta
  45. BIN
      assets/resources/game/coregame/texture/Harvest/hav_light.png
  46. 36 0
      assets/resources/game/coregame/texture/Harvest/hav_light.png.meta
  47. BIN
      assets/resources/game/coregame/texture/Harvest/noraml_btn.png
  48. 36 0
      assets/resources/game/coregame/texture/Harvest/noraml_btn.png.meta
  49. BIN
      assets/resources/game/coregame/texture/Harvest/reward_title.png
  50. 36 0
      assets/resources/game/coregame/texture/Harvest/reward_title.png.meta
  51. BIN
      assets/resources/game/coregame/texture/Harvest/superAdd_btn.png
  52. 36 0
      assets/resources/game/coregame/texture/Harvest/superAdd_btn.png.meta
  53. BIN
      assets/resources/game/coregame/texture/Harvest/whiteBg.png
  54. 36 0
      assets/resources/game/coregame/texture/Harvest/whiteBg.png.meta
  55. BIN
      assets/resources/game/coregame/texture/farm/lock.png
  56. 36 0
      assets/resources/game/coregame/texture/farm/lock.png.meta
  57. 230 6
      assets/resources/game/prefab/uiItem/PlantItem.prefab
  58. 2379 0
      assets/resources/game/prefab/uiPanel/HarvestPanel.prefab
  59. 8 0
      assets/resources/game/prefab/uiPanel/HarvestPanel.prefab.meta
  60. 41 8
      assets/resources/game/prefab/uiPanel/PlantPanel.prefab
  61. 9 22
      assets/script/before/main/FarmCountDown.ts
  62. 11 10
      assets/script/before/main/FarmGrowProcess.ts
  63. 36 35
      assets/script/before/main/FarmIcon.ts
  64. 3 0
      assets/script/before/main/FarmSystem.ts
  65. 37 0
      assets/script/before/view/data/HarvestData.ts
  66. 9 0
      assets/script/before/view/data/HarvestData.ts.meta
  67. 32 0
      assets/script/before/view/ui/HarvestPanel.ts
  68. 9 0
      assets/script/before/view/ui/HarvestPanel.ts.meta
  69. 31 6
      assets/script/before/view/uiItem/PlantItem.ts
  70. 0 1
      assets/script/game/component/BitmapFontC.ts
  71. 12 7
      assets/script/game/component/TableView.ts
  72. 14 17
      assets/script/game/component/tween/EffectOpenAndClose.ts
  73. 1 0
      assets/script/game/data/AdData.ts
  74. 3 0
      assets/script/game/data/GData.ts
  75. 5 4
      assets/script/game/data/GameData.ts
  76. 1 0
      assets/script/game/data/LoginData.ts
  77. 7 0
      assets/script/mk/system/DataSystem.ts
  78. 7 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  79. 0 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java
  80. 492 117
      build/jsb-link/js backups (useful for debugging)/main.index.js
  81. 2 2
      packages-hot-update/cfg.json

+ 57 - 0
assets/res/game/ani/faya.anim

@@ -0,0 +1,57 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "faya",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 2,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.5,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1.2,
+            "y": 0.8
+          }
+        },
+        {
+          "frame": 1,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 1.5,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.8,
+            "y": 1.2
+          }
+        },
+        {
+          "frame": 2,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/res/game/ani/faya.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "ae12a21e-b018-4660-a0ca-f5cd0fb6727f",
+  "subMetas": {}
+}

+ 61 - 0
assets/res/game/ani/plant.anim

@@ -0,0 +1,61 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "plant",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "position": [
+        {
+          "frame": 0,
+          "value": [
+            -10,
+            70,
+            0
+          ]
+        },
+        {
+          "frame": 0.5,
+          "value": [
+            0.816,
+            2.699,
+            0
+          ]
+        }
+      ],
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.3,
+            "y": 0.3
+          }
+        },
+        {
+          "frame": 0.5,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.1,
+            "y": 0.1
+          }
+        }
+      ],
+      "opacity": [
+        {
+          "frame": 0,
+          "value": 255
+        },
+        {
+          "frame": 0.5,
+          "value": 30
+        }
+      ]
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/res/game/ani/plant.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "2b70f7c2-1fb6-4a3f-841a-146cfced93d4",
+  "subMetas": {}
+}

+ 46 - 46
assets/resources/game/coregame/configs/product.json

@@ -1,48 +1,48 @@
 [
-{"tab":"农作物","level":1,"name":"小麦","picture":10001,"time":15,"redBagCoin":10,"unlock":2,"value":1},
-{"tab":"农作物","level":2,"name":"玉米","picture":10002,"time":30,"redBagCoin":12,"unlock":2,"value":1},
-{"tab":"农作物","level":3,"name":"甘蔗","picture":10003,"time":45,"redBagCoin":14,"unlock":2,"value":1},
-{"tab":"农作物","level":4,"name":"胡萝卜","picture":10004,"time":60,"redBagCoin":16,"unlock":1,"value":3},
-{"tab":"农作物","level":5,"name":"土豆","picture":10005,"time":80,"redBagCoin":18,"unlock":1,"value":3},
-{"tab":"农作物","level":6,"name":"番茄","picture":10006,"time":100,"redBagCoin":20,"unlock":1,"value":3},
-{"tab":"农作物","level":7,"name":"豌豆","picture":10007,"time":120,"redBagCoin":22,"unlock":1,"value":3},
-{"tab":"农作物","level":8,"name":"上海青","picture":10008,"time":180,"redBagCoin":24,"unlock":1,"value":3},
-{"tab":"农作物","level":9,"name":"草莓","picture":10009,"time":240,"redBagCoin":26,"unlock":1,"value":3},
-{"tab":"农作物","level":10,"name":"辣椒","picture":10010,"time":300,"redBagCoin":28,"unlock":1,"value":3},
-{"tab":"农作物","level":11,"name":"南瓜","picture":10011,"time":360,"redBagCoin":30,"unlock":1,"value":3},
-{"tab":"农作物","level":12,"name":"西瓜","picture":10012,"time":420,"redBagCoin":32,"unlock":1,"value":3},
-{"tab":"农作物","level":13,"name":"白萝卜","picture":10013,"time":480,"redBagCoin":34,"unlock":1,"value":3},
-{"tab":"农作物","level":14,"name":"冬瓜","picture":10014,"time":540,"redBagCoin":36,"unlock":1,"value":3},
-{"tab":"农作物","level":15,"name":"薰衣草","picture":10015,"time":600,"redBagCoin":38,"unlock":1,"value":3},
-{"tab":"动物","level":16,"name":"鸡","picture":30001,"time":480,"redBagCoin":40,"unlock":2,"value":5},
-{"tab":"动物","level":17,"name":"奶牛","picture":30002,"time":540,"redBagCoin":42,"unlock":2,"value":5},
-{"tab":"动物","level":18,"name":"猪","picture":30003,"time":600,"redBagCoin":44,"unlock":2,"value":5},
-{"tab":"爆米花厂","level":19,"name":"爆米花","picture":20004,"time":480,"redBagCoin":46,"unlock":2,"value":6},
-{"tab":"爆米花厂","level":20,"name":"奶油爆米花","picture":20005,"time":540,"redBagCoin":48,"unlock":1,"value":5},
-{"tab":"爆米花厂","level":21,"name":"焦糖爆米花","picture":20006,"time":600,"redBagCoin":50,"unlock":1,"value":5},
-{"tab":"糕点铺","level":22,"name":"面包","picture":20013,"time":480,"redBagCoin":52,"unlock":2,"value":6},
-{"tab":"糕点铺","level":23,"name":"面条","picture":20014,"time":540,"redBagCoin":54,"unlock":1,"value":5},
-{"tab":"糕点铺","level":24,"name":"玉米饼","picture":20015,"time":600,"redBagCoin":56,"unlock":1,"value":5},
-{"tab":"糕点铺","level":25,"name":"松饼","picture":20016,"time":480,"redBagCoin":58,"unlock":1,"value":5},
-{"tab":"糕点铺","level":26,"name":"鸡蛋仔","picture":20017,"time":540,"redBagCoin":60,"unlock":1,"value":5},
-{"tab":"糕点铺","level":27,"name":"金窝头","picture":20018,"time":600,"redBagCoin":62,"unlock":1,"value":5},
-{"tab":"制糖厂","level":28,"name":"红糖","picture":20010,"time":480,"redBagCoin":64,"unlock":2,"value":6},
-{"tab":"制糖厂","level":29,"name":"白糖","picture":20011,"time":540,"redBagCoin":66,"unlock":1,"value":5},
-{"tab":"制糖厂","level":30,"name":"糖浆","picture":20012,"time":600,"redBagCoin":68,"unlock":1,"value":5},
-{"tab":"炼乳厂","level":31,"name":"奶油","picture":20007,"time":480,"redBagCoin":70,"unlock":2,"value":6},
-{"tab":"炼乳厂","level":32,"name":"黄油","picture":20008,"time":540,"redBagCoin":72,"unlock":1,"value":5},
-{"tab":"炼乳厂","level":33,"name":"芝士","picture":20009,"time":600,"redBagCoin":74,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":34,"name":"五香饼","picture":20025,"time":240,"redBagCoin":76,"unlock":2,"value":6},
-{"tab":"功夫面馆","level":35,"name":"清汤面","picture":20026,"time":300,"redBagCoin":78,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":36,"name":"肉松饼","picture":20027,"time":360,"redBagCoin":80,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":37,"name":"蔬菜面","picture":20028,"time":420,"redBagCoin":82,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":38,"name":"酥肉面","picture":20029,"time":480,"redBagCoin":84,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":39,"name":"芝士焗面","picture":20030,"time":540,"redBagCoin":86,"unlock":1,"value":5},
-{"tab":"功夫面馆","level":40,"name":"佛跳墙","picture":20031,"time":600,"redBagCoin":88,"unlock":1,"value":5},
-{"tab":"快餐店","level":41,"name":"荷包蛋","picture":20019,"time":300,"redBagCoin":90,"unlock":2,"value":6},
-{"tab":"快餐店","level":42,"name":"鸡蛋布丁","picture":20020,"time":360,"redBagCoin":92,"unlock":1,"value":5},
-{"tab":"快餐店","level":43,"name":"满足沙拉","picture":20021,"time":420,"redBagCoin":94,"unlock":1,"value":5},
-{"tab":"快餐店","level":44,"name":"炸猪排","picture":20022,"time":480,"redBagCoin":96,"unlock":1,"value":5},
-{"tab":"快餐店","level":45,"name":"江南炒面","picture":20023,"time":540,"redBagCoin":98,"unlock":1,"value":5},
-{"tab":"快餐店","level":46,"name":"熏肉可颂","picture":20024,"time":600,"redBagCoin":100,"unlock":1,"value":5}
+{"tab":"农作物","level":1,"name":"小麦","picture":10001,"time":15,"redBagCoin":10,"MenuredBagCoin":1600,"unlock":2,"value":1},
+{"tab":"农作物","level":2,"name":"玉米","picture":10002,"time":30,"redBagCoin":12,"MenuredBagCoin":1700,"unlock":2,"value":1},
+{"tab":"农作物","level":3,"name":"甘蔗","picture":10003,"time":45,"redBagCoin":14,"MenuredBagCoin":1800,"unlock":2,"value":1},
+{"tab":"农作物","level":4,"name":"胡萝卜","picture":10004,"time":60,"redBagCoin":16,"MenuredBagCoin":1900,"unlock":1,"value":3},
+{"tab":"农作物","level":5,"name":"土豆","picture":10005,"time":80,"redBagCoin":18,"MenuredBagCoin":2000,"unlock":1,"value":3},
+{"tab":"农作物","level":6,"name":"番茄","picture":10006,"time":100,"redBagCoin":20,"MenuredBagCoin":2100,"unlock":1,"value":3},
+{"tab":"农作物","level":7,"name":"豌豆","picture":10007,"time":120,"redBagCoin":22,"MenuredBagCoin":2200,"unlock":1,"value":3},
+{"tab":"农作物","level":8,"name":"上海青","picture":10008,"time":180,"redBagCoin":24,"MenuredBagCoin":2300,"unlock":1,"value":3},
+{"tab":"农作物","level":9,"name":"草莓","picture":10009,"time":240,"redBagCoin":26,"MenuredBagCoin":2400,"unlock":1,"value":3},
+{"tab":"农作物","level":10,"name":"辣椒","picture":10010,"time":300,"redBagCoin":28,"MenuredBagCoin":2500,"unlock":1,"value":3},
+{"tab":"农作物","level":11,"name":"南瓜","picture":10011,"time":360,"redBagCoin":30,"MenuredBagCoin":2600,"unlock":1,"value":3},
+{"tab":"农作物","level":12,"name":"西瓜","picture":10012,"time":420,"redBagCoin":32,"MenuredBagCoin":2700,"unlock":1,"value":3},
+{"tab":"农作物","level":13,"name":"白萝卜","picture":10013,"time":480,"redBagCoin":34,"MenuredBagCoin":2800,"unlock":1,"value":3},
+{"tab":"农作物","level":14,"name":"冬瓜","picture":10014,"time":540,"redBagCoin":36,"MenuredBagCoin":2900,"unlock":1,"value":3},
+{"tab":"农作物","level":15,"name":"薰衣草","picture":10015,"time":600,"redBagCoin":38,"MenuredBagCoin":3000,"unlock":1,"value":3},
+{"tab":"动物","level":16,"name":"鸡","picture":30001,"time":480,"redBagCoin":40,"MenuredBagCoin":2800,"unlock":2,"value":5},
+{"tab":"动物","level":17,"name":"奶牛","picture":30002,"time":540,"redBagCoin":42,"MenuredBagCoin":2900,"unlock":2,"value":5},
+{"tab":"动物","level":18,"name":"猪","picture":30003,"time":600,"redBagCoin":44,"MenuredBagCoin":3000,"unlock":2,"value":5},
+{"tab":"爆米花厂","level":19,"name":"爆米花","picture":20004,"time":480,"redBagCoin":46,"MenuredBagCoin":2800,"unlock":2,"value":6},
+{"tab":"爆米花厂","level":20,"name":"奶油爆米花","picture":20005,"time":540,"redBagCoin":48,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"爆米花厂","level":21,"name":"焦糖爆米花","picture":20006,"time":600,"redBagCoin":50,"MenuredBagCoin":3000,"unlock":1,"value":5},
+{"tab":"糕点铺","level":22,"name":"面包","picture":20013,"time":480,"redBagCoin":52,"MenuredBagCoin":2500,"unlock":2,"value":6},
+{"tab":"糕点铺","level":23,"name":"面条","picture":20014,"time":540,"redBagCoin":54,"MenuredBagCoin":2600,"unlock":1,"value":5},
+{"tab":"糕点铺","level":24,"name":"玉米饼","picture":20015,"time":600,"redBagCoin":56,"MenuredBagCoin":2700,"unlock":1,"value":5},
+{"tab":"糕点铺","level":25,"name":"松饼","picture":20016,"time":480,"redBagCoin":58,"MenuredBagCoin":2800,"unlock":1,"value":5},
+{"tab":"糕点铺","level":26,"name":"鸡蛋仔","picture":20017,"time":540,"redBagCoin":60,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"糕点铺","level":27,"name":"金窝头","picture":20018,"time":600,"redBagCoin":62,"MenuredBagCoin":3000,"unlock":1,"value":5},
+{"tab":"制糖厂","level":28,"name":"红糖","picture":20010,"time":480,"redBagCoin":64,"MenuredBagCoin":2800,"unlock":2,"value":6},
+{"tab":"制糖厂","level":29,"name":"白糖","picture":20011,"time":540,"redBagCoin":66,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"制糖厂","level":30,"name":"糖浆","picture":20012,"time":600,"redBagCoin":68,"MenuredBagCoin":3000,"unlock":1,"value":5},
+{"tab":"炼乳厂","level":31,"name":"奶油","picture":20007,"time":480,"redBagCoin":70,"MenuredBagCoin":2800,"unlock":2,"value":6},
+{"tab":"炼乳厂","level":32,"name":"黄油","picture":20008,"time":540,"redBagCoin":72,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"炼乳厂","level":33,"name":"芝士","picture":20009,"time":600,"redBagCoin":74,"MenuredBagCoin":3000,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":34,"name":"五香饼","picture":20025,"time":240,"redBagCoin":76,"MenuredBagCoin":2400,"unlock":2,"value":6},
+{"tab":"功夫面馆","level":35,"name":"清汤面","picture":20026,"time":300,"redBagCoin":78,"MenuredBagCoin":2500,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":36,"name":"肉松饼","picture":20027,"time":360,"redBagCoin":80,"MenuredBagCoin":2600,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":37,"name":"蔬菜面","picture":20028,"time":420,"redBagCoin":82,"MenuredBagCoin":2700,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":38,"name":"酥肉面","picture":20029,"time":480,"redBagCoin":84,"MenuredBagCoin":2800,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":39,"name":"芝士焗面","picture":20030,"time":540,"redBagCoin":86,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"功夫面馆","level":40,"name":"佛跳墙","picture":20031,"time":600,"redBagCoin":88,"MenuredBagCoin":3000,"unlock":1,"value":5},
+{"tab":"快餐店","level":41,"name":"荷包蛋","picture":20019,"time":300,"redBagCoin":90,"MenuredBagCoin":2500,"unlock":2,"value":6},
+{"tab":"快餐店","level":42,"name":"鸡蛋布丁","picture":20020,"time":360,"redBagCoin":92,"MenuredBagCoin":2600,"unlock":1,"value":5},
+{"tab":"快餐店","level":43,"name":"满足沙拉","picture":20021,"time":420,"redBagCoin":94,"MenuredBagCoin":2700,"unlock":1,"value":5},
+{"tab":"快餐店","level":44,"name":"炸猪排","picture":20022,"time":480,"redBagCoin":96,"MenuredBagCoin":2800,"unlock":1,"value":5},
+{"tab":"快餐店","level":45,"name":"江南炒面","picture":20023,"time":540,"redBagCoin":98,"MenuredBagCoin":2900,"unlock":1,"value":5},
+{"tab":"快餐店","level":46,"name":"熏肉可颂","picture":20024,"time":600,"redBagCoin":100,"MenuredBagCoin":3000,"unlock":1,"value":5}
 ]

File diff suppressed because it is too large
+ 390 - 192
assets/resources/game/coregame/coregame.prefab


+ 12 - 0
assets/resources/game/coregame/texture/Harvest.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "9c80f7d1-5cdb-4c8f-a501-4ce4dbccf0c9",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "8da44aa4-b751-4045-bc73-bcaa06044d94",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/0.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/0.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3bbfe50e-d76a-49cc-b1f8-c2c5c71f40f2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 41,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "0": {
+      "ver": "1.0.4",
+      "uuid": "3bbfe50e-d76a-49cc-b1f8-c2c5c71f40f2@6c48a",
+      "rawTextureUuid": "3bbfe50e-d76a-49cc-b1f8-c2c5c71f40f2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 2,
+      "width": 37,
+      "height": 51,
+      "rawWidth": 41,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/1.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "56892ec1-cc1e-46d0-837d-1d186d2b0bc6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 34,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "1": {
+      "ver": "1.0.4",
+      "uuid": "56892ec1-cc1e-46d0-837d-1d186d2b0bc6@6c48a",
+      "rawTextureUuid": "56892ec1-cc1e-46d0-837d-1d186d2b0bc6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 26,
+      "height": 51,
+      "rawWidth": 34,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/2.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c56d4d5a-c07d-4ab0-bb85-6d765bb67694",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 36,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "2": {
+      "ver": "1.0.4",
+      "uuid": "c56d4d5a-c07d-4ab0-bb85-6d765bb67694@6c48a",
+      "rawTextureUuid": "c56d4d5a-c07d-4ab0-bb85-6d765bb67694",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 34,
+      "height": 51,
+      "rawWidth": 36,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/3.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "caba4d58-c2a0-4fc3-962e-678962fb1d03",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 41,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "3": {
+      "ver": "1.0.4",
+      "uuid": "caba4d58-c2a0-4fc3-962e-678962fb1d03@6c48a",
+      "rawTextureUuid": "caba4d58-c2a0-4fc3-962e-678962fb1d03",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2.5,
+      "offsetY": 0,
+      "trimX": 5,
+      "trimY": 2,
+      "width": 36,
+      "height": 51,
+      "rawWidth": 41,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/4.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "eb122be4-3776-483d-a30a-61680333fe03",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 37,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "4": {
+      "ver": "1.0.4",
+      "uuid": "eb122be4-3776-483d-a30a-61680333fe03@6c48a",
+      "rawTextureUuid": "eb122be4-3776-483d-a30a-61680333fe03",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 36,
+      "height": 51,
+      "rawWidth": 37,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/5.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a644efde-694b-4628-83e2-d8b68e1ef379",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 39,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "5": {
+      "ver": "1.0.4",
+      "uuid": "a644efde-694b-4628-83e2-d8b68e1ef379@6c48a",
+      "rawTextureUuid": "a644efde-694b-4628-83e2-d8b68e1ef379",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 3,
+      "trimY": 2,
+      "width": 34,
+      "height": 51,
+      "rawWidth": 39,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/6.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "4cf42e14-49ea-48a8-9cf8-e1dfe3313900",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 37,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "6": {
+      "ver": "1.0.4",
+      "uuid": "4cf42e14-49ea-48a8-9cf8-e1dfe3313900@6c48a",
+      "rawTextureUuid": "4cf42e14-49ea-48a8-9cf8-e1dfe3313900",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 35,
+      "height": 51,
+      "rawWidth": 37,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/7.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "26de6dc4-5f9a-4203-b703-676fd8b27079",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 37,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "7": {
+      "ver": "1.0.4",
+      "uuid": "26de6dc4-5f9a-4203-b703-676fd8b27079@6c48a",
+      "rawTextureUuid": "26de6dc4-5f9a-4203-b703-676fd8b27079",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 3,
+      "width": 37,
+      "height": 50,
+      "rawWidth": 37,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/8.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/8.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "4bcaa800-5393-4231-b79b-3ba048df6a57",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 39,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "8": {
+      "ver": "1.0.4",
+      "uuid": "4bcaa800-5393-4231-b79b-3ba048df6a57@6c48a",
+      "rawTextureUuid": "4bcaa800-5393-4231-b79b-3ba048df6a57",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 36,
+      "height": 51,
+      "rawWidth": 39,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/9.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/9.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "898966b4-9a90-4432-b7c3-96d291a0f274",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 36,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "9": {
+      "ver": "1.0.4",
+      "uuid": "898966b4-9a90-4432-b7c3-96d291a0f274@6c48a",
+      "rawTextureUuid": "898966b4-9a90-4432-b7c3-96d291a0f274",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 34,
+      "height": 51,
+      "rawWidth": 36,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/x.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/getwindow_numbers/x.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c9cf4446-2821-45ac-a52b-57edf14947cb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 49,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "x": {
+      "ver": "1.0.4",
+      "uuid": "c9cf4446-2821-45ac-a52b-57edf14947cb@6c48a",
+      "rawTextureUuid": "c9cf4446-2821-45ac-a52b-57edf14947cb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 0,
+      "trimX": 3,
+      "trimY": 2,
+      "width": 46,
+      "height": 51,
+      "rawWidth": 49,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/harvest_byte_0.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/harvest_byte_0.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c382b503-2859-47e3-b143-e116260d4fce",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 367,
+  "height": 70,
+  "platformSettings": {},
+  "subMetas": {
+    "harvest_byte_0": {
+      "ver": "1.0.4",
+      "uuid": "c382b503-2859-47e3-b143-e116260d4fce@6c48a",
+      "rawTextureUuid": "c382b503-2859-47e3-b143-e116260d4fce",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 0.5,
+      "trimX": 9,
+      "trimY": 11,
+      "width": 353,
+      "height": 47,
+      "rawWidth": 367,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/harvest_byte_1.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/harvest_byte_1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 263,
+  "height": 62,
+  "platformSettings": {},
+  "subMetas": {
+    "harvest_byte_1": {
+      "ver": "1.0.4",
+      "uuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5@6c48a",
+      "rawTextureUuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 0,
+      "trimX": 5,
+      "trimY": 0,
+      "width": 256,
+      "height": 62,
+      "rawWidth": 263,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/harvest_byte_2.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/harvest_byte_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "add40e2a-7672-4ed5-bee6-0ba43f2de70a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 324,
+  "height": 38,
+  "platformSettings": {},
+  "subMetas": {
+    "harvest_byte_2": {
+      "ver": "1.0.4",
+      "uuid": "add40e2a-7672-4ed5-bee6-0ba43f2de70a@6c48a",
+      "rawTextureUuid": "add40e2a-7672-4ed5-bee6-0ba43f2de70a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 1.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 323,
+      "height": 35,
+      "rawWidth": 324,
+      "rawHeight": 38,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_0.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_0.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "22547215-3b9d-482d-bdf3-62a85ecd87c0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 139,
+  "height": 35,
+  "platformSettings": {},
+  "subMetas": {
+    "hav_btn_byte_0": {
+      "ver": "1.0.4",
+      "uuid": "22547215-3b9d-482d-bdf3-62a85ecd87c0@6c48a",
+      "rawTextureUuid": "22547215-3b9d-482d-bdf3-62a85ecd87c0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 1,
+      "trimX": 8,
+      "trimY": 3,
+      "width": 126,
+      "height": 27,
+      "rawWidth": 139,
+      "rawHeight": 35,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_1.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "36b9f861-5660-45e6-8568-274ff78a6583",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 140,
+  "height": 35,
+  "platformSettings": {},
+  "subMetas": {
+    "hav_btn_byte_1": {
+      "ver": "1.0.4",
+      "uuid": "36b9f861-5660-45e6-8568-274ff78a6583@6c48a",
+      "rawTextureUuid": "36b9f861-5660-45e6-8568-274ff78a6583",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2,
+      "offsetY": 1,
+      "trimX": 5,
+      "trimY": 3,
+      "width": 126,
+      "height": 27,
+      "rawWidth": 140,
+      "rawHeight": 35,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_2.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 132,
+  "height": 17,
+  "platformSettings": {},
+  "subMetas": {
+    "hav_btn_byte_2": {
+      "ver": "1.0.4",
+      "uuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b@6c48a",
+      "rawTextureUuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 0,
+      "trimX": 6,
+      "trimY": 0,
+      "width": 124,
+      "height": 17,
+      "rawWidth": 132,
+      "rawHeight": 17,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_3.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/hav_btn_byte_3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 179,
+  "height": 17,
+  "platformSettings": {},
+  "subMetas": {
+    "hav_btn_byte_3": {
+      "ver": "1.0.4",
+      "uuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6@6c48a",
+      "rawTextureUuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 0,
+      "trimX": 7,
+      "trimY": 0,
+      "width": 169,
+      "height": 17,
+      "rawWidth": 179,
+      "rawHeight": 17,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/hav_light.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/hav_light.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "55fe205c-efc6-4734-965e-509e93b7ecdc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 221,
+  "height": 221,
+  "platformSettings": {},
+  "subMetas": {
+    "hav_light": {
+      "ver": "1.0.4",
+      "uuid": "55fe205c-efc6-4734-965e-509e93b7ecdc@6c48a",
+      "rawTextureUuid": "55fe205c-efc6-4734-965e-509e93b7ecdc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 219,
+      "height": 221,
+      "rawWidth": 221,
+      "rawHeight": 221,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/noraml_btn.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/noraml_btn.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "43d7bb1b-b77e-4d41-a73a-9c37af80b639",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 170,
+  "height": 60,
+  "platformSettings": {},
+  "subMetas": {
+    "noraml_btn": {
+      "ver": "1.0.4",
+      "uuid": "43d7bb1b-b77e-4d41-a73a-9c37af80b639@6c48a",
+      "rawTextureUuid": "43d7bb1b-b77e-4d41-a73a-9c37af80b639",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 170,
+      "height": 60,
+      "rawWidth": 170,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/reward_title.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/reward_title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ea0e1dd5-fb50-4fb1-8f25-f8afd3a0fd22",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 382,
+  "height": 207,
+  "platformSettings": {},
+  "subMetas": {
+    "reward_title": {
+      "ver": "1.0.4",
+      "uuid": "ea0e1dd5-fb50-4fb1-8f25-f8afd3a0fd22@6c48a",
+      "rawTextureUuid": "ea0e1dd5-fb50-4fb1-8f25-f8afd3a0fd22",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 4.5,
+      "offsetY": 7,
+      "trimX": 23,
+      "trimY": 0,
+      "width": 345,
+      "height": 193,
+      "rawWidth": 382,
+      "rawHeight": 207,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/superAdd_btn.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/superAdd_btn.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1b5c167c-1755-4a65-b2fc-d4197a8e4fe4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 170,
+  "height": 60,
+  "platformSettings": {},
+  "subMetas": {
+    "superAdd_btn": {
+      "ver": "1.0.4",
+      "uuid": "1b5c167c-1755-4a65-b2fc-d4197a8e4fe4@6c48a",
+      "rawTextureUuid": "1b5c167c-1755-4a65-b2fc-d4197a8e4fe4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 170,
+      "height": 60,
+      "rawWidth": 170,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/Harvest/whiteBg.png


+ 36 - 0
assets/resources/game/coregame/texture/Harvest/whiteBg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "af151c8b-4bed-4420-aebd-2a721d322968",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 412,
+  "height": 127,
+  "platformSettings": {},
+  "subMetas": {
+    "whiteBg": {
+      "ver": "1.0.4",
+      "uuid": "af151c8b-4bed-4420-aebd-2a721d322968@6c48a",
+      "rawTextureUuid": "af151c8b-4bed-4420-aebd-2a721d322968",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3,
+      "offsetY": 0.5,
+      "trimX": 1,
+      "trimY": 4,
+      "width": 404,
+      "height": 118,
+      "rawWidth": 412,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/farm/lock.png


+ 36 - 0
assets/resources/game/coregame/texture/farm/lock.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "7a9650e2-43da-4c4b-91cd-6cd872065cdb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 200,
+  "height": 200,
+  "platformSettings": {},
+  "subMetas": {
+    "lock": {
+      "ver": "1.0.4",
+      "uuid": "0c860566-4520-434f-9286-27075963cff4",
+      "rawTextureUuid": "7a9650e2-43da-4c4b-91cd-6cd872065cdb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 21,
+      "trimY": 0,
+      "width": 158,
+      "height": 200,
+      "rawWidth": 200,
+      "rawHeight": 200,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 230 - 6
assets/resources/game/prefab/uiItem/PlantItem.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 63
       },
       {
-        "__id__": 58
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -1924,16 +1924,22 @@
     "_children": [
       {
         "__id__": 52
+      },
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 58
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2090,6 +2096,221 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "lock",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 51
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 56
+      }
+    ],
+    "_prefab": {
+      "__id__": 57
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 158,
+      "height": 200
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        89,
+        52,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.3,
+        0.3,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 55
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "0c860566-4520-434f-9286-27075963cff4"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "ca279bfd-c7e6-46f5-9731-0a636e046674"
+    },
+    "fileId": "b7cFmsMldDdZ4pLlRzOAku",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "解锁条件文本",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 51
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 133.35,
+      "height": 67.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        89,
+        -23,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 58
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "种植3次小麦\n即可解锁",
+    "_N$string": "种植3次小麦\n即可解锁",
+    "_fontSize": 24,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "ca279bfd-c7e6-46f5-9731-0a636e046674"
+    },
+    "fileId": "438iQmqpRAl6LRaCLlgm7K",
+    "sync": false
+  },
+  {
     "__type__": "cc.Mask",
     "_name": "",
     "_objFlags": 0,
@@ -2177,6 +2398,9 @@
     "maskNode": {
       "__id__": 51
     },
+    "labUnlock": {
+      "__id__": 59
+    },
     "_id": ""
   },
   {

+ 2379 - 0
assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -0,0 +1,2379 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "HarvestPanel",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 61
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 64
+      }
+    ],
+    "_prefab": {
+      "__id__": 65
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "界面",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 588,
+      "height": 603
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "closeButton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 81,
+      "height": 86
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        248.66,
+        269.854,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "194df592-3d3d-4882-bedd-c7e2f9cbcdca@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "725b4fG+ExKb4MIvjsnBTr7",
+    "handler": "clickClose",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "c7pLaMlbREP5XNuOjWIZss",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "界面布局",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 24
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 58
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hav_light",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 10
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 219,
+      "height": 221
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        176.32,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hongbao",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 44,
+      "height": 48
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        2,
+        2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "ccf6ba12-cd01-45df-bdda-453cccb2aa25@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "e6XOqhnMJGfoOXd956+v/c",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "55fe205c-efc6-4734-965e-509e93b7ecdc@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "b4b++2+DxEx6UmGScMY9r9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "harvest_byte_0",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 353,
+      "height": 47
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        71.137,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c382b503-2859-47e3-b143-e116260d4fce@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "b22AIOq1pC66y3afYYPTKt",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "whiteBg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 404,
+      "height": 118
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -30.185000000000002,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "harvest_byte_1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 256,
+      "height": 62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "36xyb1sHhLFKy/2dTHCcW9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "af151c8b-4bed-4420-aebd-2a721d322968@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "46F34dphRGG6sptFBmlIr3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 40
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 56
+      }
+    ],
+    "_prefab": {
+      "__id__": 57
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 440,
+      "height": 80
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -136.345,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "普通领取",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 24
+    },
+    "_children": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 34
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -135,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "noraml_btn",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 25
+    },
+    "_children": [
+      {
+        "__id__": 27
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hav_btn_byte_0",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 26
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 29
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 126,
+      "height": 27
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "22547215-3b9d-482d-bdf3-62a85ecd87c0@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "b9Hp/BA2FGkLdmE4T2nNgn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "43d7bb1b-b77e-4d41-a73a-9c37af80b639@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 32
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "725b4fG+ExKb4MIvjsnBTr7",
+    "handler": "clickNormalBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "2aTSXi1nVDMLG5FhaNOqbT",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hav_btn_byte_2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 25
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 36
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 124,
+      "height": 17
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -47.946,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 34
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "ff480Rzf1JqogPgAYmLyD3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 25
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 38
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "725b4fG+ExKb4MIvjsnBTr7",
+    "handler": "clickNormalBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "c93r20PSVPN6PUmfH7nchB",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "超级加倍",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 24
+    },
+    "_children": [
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 55
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 220,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        110,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "noraml_btn",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 40
+    },
+    "_children": [
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 45
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 48
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        21.473,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hav_btn_byte_0",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 41
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      }
+    ],
+    "_prefab": {
+      "__id__": 44
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 126,
+      "height": 27
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "36b9f861-5660-45e6-8568-274ff78a6583@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "18iL/tyrtBIrQKnN71/ADJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "video_icon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 41
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 46
+      }
+    ],
+    "_prefab": {
+      "__id__": 47
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 71,
+      "height": 68
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -98.036,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 45
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "b7c2b0ee-ffff-4822-add8-18fb1b55161c@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "80/OFG6SxKDJ6IgnTGCWGb",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 41
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1b5c167c-1755-4a65-b2fc-d4197a8e4fe4@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "27nyUezbRPtJhfLJctaxCq",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hav_btn_byte_2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 40
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 51
+      }
+    ],
+    "_prefab": {
+      "__id__": 52
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 169,
+      "height": 17
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        21.473,
+        -47.946,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "14d6f54b-9e38-4fc1-978a-21a24f119bc6@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "f9Wn5v7/9Dt6PGPv1+19l4",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 40
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 54
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "725b4fG+ExKb4MIvjsnBTr7",
+    "handler": "clickSuperBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "22qVJZhMBBro8LWMlx1q3C",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 440,
+      "height": 80
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 50,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "9fzUAOHC5EpItHjFBHKPH9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "633IWNHylEMbdHKt6PL85g",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "834466ee-a879-422e-84d0-ed020911f2ed@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "d5PRBRSipIyYAl+eLy4sfI",
+    "sync": false
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 180
+    },
+    "design_block_node": {
+      "__id__": 2
+    },
+    "bClickClose": true,
+    "onComplete": [
+      {
+        "__id__": 62
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "725b4fG+ExKb4MIvjsnBTr7",
+    "handler": "clickClose",
+    "customEventData": ""
+  },
+  {
+    "__type__": "725b4fG+ExKb4MIvjsnBTr7",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/game/prefab/uiPanel/HarvestPanel.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "04dd6ff2-c365-488b-9c49-8994289ce473",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 41 - 8
assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 17
-      },
-      {
         "__id__": 18
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 20
+      },
+      {
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -105,10 +105,13 @@
     "_components": [
       {
         "__id__": 15
+      },
+      {
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -120,7 +123,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 750.0000000000001,
       "height": 500
     },
     "_anchorPoint": {
@@ -132,8 +135,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -667,
+        981.4070000000002,
+        -175.98299999999995,
         0,
         0,
         0,
@@ -596,6 +599,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 44,
+    "_left": 981.407,
+    "_right": -981.407,
+    "_top": 0,
+    "_bottom": -8.983000000000004,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -645,8 +675,11 @@
       "__id__": 2
     },
     "open_effect": 5,
+    "isOpenCloseEffect": true,
     "close_effect": 5,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": true,
     "_id": ""
   },
   {

+ 9 - 22
assets/script/before/main/FarmCountDown.ts

@@ -12,42 +12,29 @@ export class FarmCountDown extends cc.Component {
     @property({ type: BitmapFontC, tooltip: "常驻计时" }) normalCount: BitmapFontC = null;
     @property({ type: cc.Node, tooltip: "可收获图标" }) ripedIcon: cc.Node = null;
 
-    // @property({ type: Node, tooltip: "点击计时器组" }) selectGroup: cc.Node = null;
-    // @property({ type: cc.ProgressBar, tooltip: "点击进度条" }) selectProgress: cc.ProgressBar = null;
-    // @property({ type: BitmapFont, tooltip: "点击计时" }) selectCount: BitmapFont = null;
-    // @property({ type: cc.Sprite, tooltip: "作物图标" }) plantIcon: cc.Sprite = null;
-    // @property({ type: cc.Label, tooltip: "加速花费文本" }) castLabel: cc.Label = null;
-
-    // @property({ tooltip: "网络请求对象", type: Http }) http: Http;
-
     private counting = false;
     /**成熟时间戳 */
     private ripeTime = 0;
     /**总时长 */
     private totleTime = 0;
-    private buildID = 0;
     private isDataed = false;
-    public async setData(configID: number, isShow = true) {
+    public async setData(data) {
         if (!this.isDataed) {
             this.isDataed = true;
-            this.buildID = configID;
-            // let producting = gData.gameData.getProductingList(configID)[0];
-            // let config = gData.configData.configMap.get("product");
-            // let result = config[producting.productID];
-            // this.ripeTime = producting.ripeDate;
-            // this.totleTime = result["time"];
-            // this.normalGroup.active = true;
-            // this.counting = true;
-
-            // this.selectGroup.active = isShow;
-            // this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + producting.productID + "/spriteFrame", cc.SpriteFrame);
+            let producting = gData.gameData.getProductMap(data.productID);
+            this.ripeTime = data.growSpan;
+            this.totleTime = producting.time;
+            this.normalGroup.active = true;
+            this.counting = true;
+            this.normalCount.string = '';
+            this.normalProgress.progress = 0;
         }
     }
 
     update() {
         let now = Date.now();
         if (this.counting && now < this.ripeTime) {
-            let timeString = Util.formatCountDown(this.ripeTime - now);
+            let timeString = Util.ParseTime2Format(Math.floor((this.ripeTime - now) * 0.001), 'h:m:s');
             this.normalCount.string = timeString;
             this.normalProgress.progress = 1 - ((this.ripeTime - now) / (this.totleTime * 1000));
         } else if (this.counting && now > this.ripeTime) {

+ 11 - 10
assets/script/before/main/FarmGrowProcess.ts

@@ -16,21 +16,22 @@ export class FarmGrowProcess extends cc.Component {
     /**当前成长阶段 */
     private nowState = -1;
     private isDataed = false;
-    public async setData(configID: number) {
+
+    private data = null;
+    public async setData(data) {
         if (!this.isDataed) {
+            this.data = data;
             this.isDataed = true;
-            let producting = gData.gameData.getProductingList(configID)[0];
-            let config = gData.configData.configMap.get("product");
-            let result = config[producting.productID];
-            this.ripeTime = producting.ripeDate;
-            this.totleTime = result["time"];
+            let producting = gData.gameData.getProductMap(data.productID);
+            this.ripeTime = data.growSpan;
+            this.totleTime = producting.time;
 
             this.seedIcon.node.active = true;
-            this.seedIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/seed/seedIcon_" + producting.productID + "/spriteFrame", cc.SpriteFrame);
+            this.seedIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/seed/seedIcon_" + data.productID, cc.SpriteFrame);
             for (let i = 0; i < this.fayas.length; i++) {
-                this.fayas[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/faya/faya_" + producting.productID + "/spriteFrame", cc.SpriteFrame);
-                this.grows[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/chengzhang/cz_" + producting.productID + "/spriteFrame", cc.SpriteFrame);
-                this.ripes[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/ripe/ripe_" + producting.productID + "/spriteFrame", cc.SpriteFrame);
+                this.fayas[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/faya/faya_" + data.productID, cc.SpriteFrame);
+                this.grows[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/chengzhang/cz_" + data.productID, cc.SpriteFrame);
+                this.ripes[i].spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/ripe/ripe_" + data.productID, cc.SpriteFrame);
             }
             this.changeState(0);
         }

+ 36 - 35
assets/script/before/main/FarmIcon.ts

@@ -1,4 +1,5 @@
 import { FarmState, ProductType } from '../../game/data/GameData';
+import { Data } from '../../mk/data/Data';
 import { MoveToCenter } from '../map/MoveToCenter';
 import { FarmCountDown } from './FarmCountDown';
 import { FarmGrowProcess } from './FarmGrowProcess';
@@ -20,7 +21,6 @@ export class FarmIcon extends cc.Component {
     public configID: number = 0;
     public sortID: number = 0;
 
-    private farmSystem: FarmSystem;
     private plantID: number = 0;
     private _state: FarmState = -1;
     public get state(): FarmState { return this._state; }
@@ -35,7 +35,7 @@ export class FarmIcon extends cc.Component {
         this.freshState();
     }
 
-    update() {
+    update(dt) {
         // if (this.state == FarmState.Lock && gData.gameData.hasBuildData(this.configID)) {
         //     this.activeFram();
         // }
@@ -115,11 +115,15 @@ export class FarmIcon extends cc.Component {
                 gData.adUnlockData.openPanel(this.configID);
                 break;
             case FarmState.Empty:
+                gData.farmSystem.currSelectFarm = this;
                 gData.plantData.openPanel(ProductType.nzw, this.configID);
                 break;
             case FarmState.Growing:
+
                 break;
             case FarmState.Ripe:
+                gData.farmSystem.currSelectFarm = this;
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this));
                 break;
         }
     }
@@ -127,53 +131,50 @@ export class FarmIcon extends cc.Component {
     public onHarvest(): void {
         this.countDown.cleanRiped();
         this.process.cleanProcess();
-        this.farmSystem.currSelectFarm = null;
-        // gData.gameData.getProductingList(this.configID).shift();
+        gData.farmSystem.currSelectFarm = null;
+
+        this.data.state = FarmState.Empty;
+        this.data.productID = 0;
+        this.data.growSpan = 0;
+        gData.gameData.setFarmDataMap(this.configID, this.data);
     }
 
     public async plant(id: number) {
-        // if (this.state == FarmState.Empty && !FarmManager.plantIsRequesting) {
-        //     FarmManager.plantIsRequesting = true;
-        //     let result = await this.http.send("/api/product/createOrder", { buildID: this.configID, productID: id });
-        //     if (result.code == 0) {
-        //         this.plantID = id;
-        //         FarmManager.plantCountMap.set(this.plantID, FarmManager.plantCountMap.get(this.plantID) - 1);
-        //         if (FarmManager.plantCountMap.get(this.plantID) == 0) {
-        //             PlantWindow.needReLoad = true;
-        //         }
-        //         this.plantIcon.node.active = true;
-        //         this.plantIcon.spriteFrame = await ResourcesUtils.load<SpriteFrame>("plant_icons/" + "plantIcon_" + this.plantID + "/spriteFrame", SpriteFrame, this.node);
-        //         this.plantIcon.getComponent(Animation).play();
-        //         this.plantIcon.getComponent(Sound).play();
-        //         this.plantIcon.getComponent(Animation).on(Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-
-        //         let config = ConfigData.configMap.get("product")[this.plantID];
-        //         g.gameData.getProductingList(this.configID).push({ productID: this.plantID, ripeDate: Date.now() + config["time"] * 1000 });
-        //         this.farmSystem.selectNextFarm();
-        //         if (result.data.productPrize) {
-        //             g.gameData.productPrize = result.data.productPrize;
-        //         }
-        //     }
-        //     // else {
-        //     //     WindowManager.showTips("请求失败");
-        //     // }
-        //     FarmManager.plantIsRequesting = false;
-        // }
+        if (this.state == FarmState.Empty && !gData.farmSystem.plantIsRequesting) {
+            this.plantID = id;
+            gData.farmSystem.plantIsRequesting = true;
+            let config = gData.gameData.getProductMap(this.plantID);
+            let growSpan = Date.now() + config.time * 1000;
+            this.data.state = FarmState.Growing;
+            this.data.productID = this.plantID;
+            this.data.growSpan = growSpan;
+            gData.gameData.setFarmDataMap(this.configID, this.data);
+
+            this.plantIcon.node.active = true;
+            this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
+            this.plantIcon.getComponent(cc.Animation).play();
+            // this.plantIcon.getComponent(Sound).play();
+            this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
+            gData.farmSystem.selectNextFarm();
+
+            gData.farmSystem.plantIsRequesting = false;
+        }
     }
     public onRiped(): void {
         this._state = FarmState.Ripe;
-        // gData.gameData.getProductingList(this.configID)[0].ripeDate = Date.now();
+        this.data.state = FarmState.Ripe;
+        gData.gameData.setFarmDataMap(this.configID, this.data);
     }
 
     private async onPlantAnimationFinish() {
         this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
         this.plantIcon.node.active = false;
-        this.countDown.setData(this.configID);
-        this.process.setData(this.configID);
+        this.countDown.setData(this.data);
+        this.process.setData(this.data);
     }
 
     public novice_plant(): void {
-        this.process.setData(this.configID);
+        this.process.setData(this.data);
     }
 
     public novice_clean(): void {

+ 3 - 0
assets/script/before/main/FarmSystem.ts

@@ -10,6 +10,9 @@ export class FarmSystem {
     public farms: Array<FarmIcon> = [];
     private _currSelectFarm: FarmIcon = null;
     public plantWindowIsOpening = false;
+    /** 种植冷却 */
+    public plantIsRequesting = false;
+    
     public set currSelectFarm(farm: FarmIcon) {
         if (this._currSelectFarm) {
             this._currSelectFarm.selectFarm(false);

+ 37 - 0
assets/script/before/view/data/HarvestData.ts

@@ -0,0 +1,37 @@
+/**收获界面数据类 */
+
+import { Data } from "../../../mk/data/Data";
+
+const { ccclass } = cc._decorator;
+
+@ccclass
+export default class HarvestData extends Data {
+    configID = null;
+    plantID = null;
+    config = null;
+    call = null;
+    openPanel(configID, plantID, call) {
+        this.configID = configID;
+        this.plantID = plantID;
+        this.call = call;
+        this.config = gData.gameData.getProductMap(this.plantID);
+
+        mk.ui.openPanel('game/prefab/uiPanel/HarvestPanel');
+    }
+
+    setAdData(data) {
+        super.setAdData(data);
+        //领取超级加倍红包
+        this.setToEmpty();
+    }
+
+    /** 收取后变为空地 */
+    setToEmpty() {
+        if (this.call) {
+            this.call();
+            this.call = null;
+        }
+
+        mk.ui.closePanel('HarvestPanel');
+    }
+}

+ 9 - 0
assets/script/before/view/data/HarvestData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "3a59c328-f57a-43bb-80e9-7b70699657f2",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 32 - 0
assets/script/before/view/ui/HarvestPanel.ts

@@ -0,0 +1,32 @@
+/**
+ * 收获界面
+ */
+
+import { AdFun } from "../../../game/data/AdData";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class HarvestPanel extends cc.Component {
+    public async clickNormalBtn() {
+        // gData.harvestData.config.picture
+        //调用收获红包币接口
+        gData.harvestData.setToEmpty();
+    }
+
+    public async clickSuperBtn() {
+        // 看广告
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {
+                gData.adData.watchVideo(AdFun.harvest);
+
+                // mk.ad.destroyNativeAd();
+            }
+        });
+    }
+
+    clickClose() {
+        mk.ui.closePanel(this.node.name);
+    }
+}

+ 9 - 0
assets/script/before/view/ui/HarvestPanel.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "725b47c6-f84c-4a6f-8308-be3b27053afb",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 31 - 6
assets/script/before/view/uiItem/PlantItem.ts

@@ -12,7 +12,9 @@ export default class PlantItem extends cc.Component {
     @property({ type: BitmapFontC, tooltip: "获得数量文本" }) awardLabel: BitmapFontC = null;
     @property({ type: BitmapFontC, tooltip: "成熟时间文本" }) timeLabel: BitmapFontC = null;
     @property({ type: cc.Node, tooltip: "未开启遮罩" }) maskNode: cc.Node = null;
+    @property({ type: cc.Label, tooltip: "未开条件" }) labUnlock: cc.Label = null;
 
+    private data = null;
     /**
      * list_data
      * @param list_data 数据列表
@@ -26,9 +28,10 @@ export default class PlantItem extends cc.Component {
      * @param list_data 数据列表
      */
     private async initItem(list_data) {
+        this.data = list_data;
         this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + list_data.picture, cc.SpriteFrame);
         this.nameIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + list_data.picture, cc.SpriteFrame);
-        this.awardLabel.string = list_data.redBagCoin;
+        this.awardLabel.string = list_data.MenuredBagCoin;
         this.timeLabel.string = list_data.time;
         let unlock = false;
         //根据上个商品种植次数
@@ -45,15 +48,37 @@ export default class PlantItem extends cc.Component {
             }
         }
 
-        if (!this.maskNode.active && !unlock) {
-            this.maskNode.active = true;
-        }
-        else {
-            this.maskNode.active = false;
+        this.maskNode.active = !unlock;
+        if (!unlock) {
+            let des = this.getDesByType();
+            let plantName = gData.gameData.getProductMap(this.data.picture - 1).name;
+            this.labUnlock.string = `${des}${this.data.value}次${plantName}\n即可解锁`;
         }
     }
 
     clickMake() {
+        gData.farmSystem.plant(this.data.picture);
+    }
+
+    getDesByType() {
+        let des = ''
+        switch (this.data.tab) {
+            case '农作物':
+                des = '种植';
+                break;
+            case '动物':
+                des = '养殖';
+                break;
+            case '爆米花厂':
+            case '糕点铺':
+            case '制糖厂':
+            case '炼乳厂':
+            case '功夫面馆':
+            case '快餐店':
+                des = '制作';
+                break;
+        }
 
+        return des;
     }
 }

+ 0 - 1
assets/script/game/component/BitmapFontC.ts

@@ -1,4 +1,3 @@
-import { BitmapFontData } from "./BitmapData";
 
 const { ccclass, property } = cc._decorator;
 

+ 12 - 7
assets/script/game/component/TableView.ts

@@ -366,9 +366,9 @@ export default class TableView extends cc.Component {
         }
         else {
             if (this.content.width > this.layerWith) {
-                let firstItemPos = this.scrollView.getScrollOffset().x;
+                let firstItemPos = -this.scrollView.getScrollOffset().x;
                 let lastItemPos = firstItemPos + this.layerWith;
-                if (firstItemPos > 0) return;
+                if (firstItemPos < 0) return;
                 if (this.initItemData) {
                     // cc.log('111:%o', this.itemPosMap)
                     this.initItemData = false;
@@ -380,13 +380,13 @@ export default class TableView extends cc.Component {
 
                 //超出边界直接返回.
                 //滚动条向上滑动可能会触发的函数
-                if (firstItemPos < this.firstItemData.endPos) {
+                if (firstItemPos > this.firstItemData.endPos) {
                     if (this.lastItemIndex + 1 < this.itemData.length) {
                         this.updateFirstItemIndex();
                     }
                     this.count++;
                 }
-                if (lastItemPos < this.lastItemData.endPos) {
+                if (lastItemPos > this.lastItemData.endPos) {
                     if (this.lastItemIndex + 1 < this.itemData.length) {
                         this.itemCanMoveDown = true;
                         this.updateLastItemIndex();
@@ -394,11 +394,11 @@ export default class TableView extends cc.Component {
                     }
                 }
                 //滚动条向下滑动可能会触发的函数
-                if (lastItemPos > this.lastItemData.startPos) {
+                if (lastItemPos < this.lastItemData.startPos) {
                     this.updateLastItemIndex();
                     this.count--;
                 }
-                if (firstItemPos > this.firstItemData.startPos) {
+                if (firstItemPos < this.firstItemData.startPos) {
                     this.itemCanMoveUp = true;
                     this.updateFirstItemIndex();
                     this.itemCanMoveUp = false;
@@ -435,6 +435,8 @@ export default class TableView extends cc.Component {
         if (this.direction == Direction.vertical) {
             let firstItemPos = this.scrollView.getScrollOffset().y;
             let lastItemPos = firstItemPos + this.layerHeight;
+            console.log('firstItemPos 22    ', firstItemPos)
+            console.log('lastItemPos 22   ', lastItemPos)
             this.itemPosMap.forEach((value, key) => {
                 let status1 = value.startPos <= firstItemPos && value.endPos > firstItemPos;
                 let status2 = value.startPos >= firstItemPos && value.endPos < lastItemPos;
@@ -454,8 +456,10 @@ export default class TableView extends cc.Component {
             })
         }
         else {
-            let firstItemPos = this.scrollView.getScrollOffset().x;
+            let firstItemPos = -this.scrollView.getScrollOffset().x;
             let lastItemPos = firstItemPos + this.layerWith;
+            console.log('firstItemPos  ', firstItemPos)
+            console.log('lastItemPos  ', lastItemPos)
             this.itemPosMap.forEach((value, key) => {
                 let status1 = value.startPos <= firstItemPos && value.endPos > firstItemPos;
                 let status2 = value.startPos >= firstItemPos && value.endPos < lastItemPos;
@@ -474,6 +478,7 @@ export default class TableView extends cc.Component {
                 }
             })
         }
+        console.log('arr >>>>> ', arr)
         return arr;
     }
 

+ 14 - 17
assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -26,7 +26,7 @@ export default class EffectOpenAndClose extends cc.Component {
     @property({ type: cc.Enum(EffectType), displayName: '打开动画节点效果', visible() { return this.effect_par } })
     private open_effect: EffectType = EffectType.scale;
 
-    @property({displayName: '是否打开关闭动画'})
+    @property({ displayName: '是否打开关闭动画' })
     private isOpenCloseEffect: boolean = true;
     @property({ type: cc.Enum(EffectType), displayName: '关闭动画节点效果', visible() { return this.effect_par && this.isOpenCloseEffect } })
     private close_effect: EffectType = EffectType.scale;
@@ -34,10 +34,10 @@ export default class EffectOpenAndClose extends cc.Component {
     @property({ displayName: '关闭节点缩小到此节点坐标', visible() { return this.close_effect == EffectType.scaleToPoint } })
     private close_toPoint: string = "";
 
-    @property({displayName: '做关闭动画之前是否关闭黑背景'})
+    @property({ displayName: '做关闭动画之前是否关闭黑背景' })
     private close_uibg: boolean = false;
 
-    @property({displayName: '是否延迟一帧做动画'})
+    @property({ displayName: '是否延迟一帧做动画' })
     private isDelayOneFrame: boolean = false;
 
     private _play_open: boolean = false;
@@ -72,23 +72,22 @@ export default class EffectOpenAndClose extends cc.Component {
 
     start() {
         if (CC_EDITOR) return;
-        if(this.isDelayOneFrame)
-        {
-            cc.tween(this.effect_par).delay(0.16).call(()=>{
+        if (this.isDelayOneFrame) {
+            cc.tween(this.effect_par).delay(0.16).call(() => {
                 this.showEffect();
             }).start();
-        }else{
+        } else {
             this.showEffect();
         }
-        
-        
+
+
     }
 
     /**
      * 界面打开效果
      */
     private showEffect() {
-        
+
         if (this.effect_par) {
             switch (this.open_effect) {
                 case EffectType.none:
@@ -109,7 +108,7 @@ export default class EffectOpenAndClose extends cc.Component {
                 case EffectType.bottomIn:
                     this.effect_par.active = true;
                     this.effect_par.x = 0;
-                    this.effect_par.y = this.effect_par.y -cc.winSize.height;
+                    this.effect_par.y = this.effect_par.y - cc.winSize.height;
                     //let toY = this.effect_par.y + this.effect_par.height;
                     let toY = 0;
                     cc.tween(this.effect_par)
@@ -126,20 +125,18 @@ export default class EffectOpenAndClose extends cc.Component {
      */
     public hideEffect(cb?: Function) {
 
-        if(!this.isOpenCloseEffect)
+        if (!this.isOpenCloseEffect)
             return;
 
         if (this.effect_par) {
 
-            if(this.close_uibg)
-            {
+            if (this.close_uibg) {
                 let graph = this.node.getComponentInChildren(cc.Graphics);
-                if(graph)
-                {
+                if (graph) {
                     graph.enabled = false;
                 }
             }
-            
+
             switch (this.close_effect) {
                 case EffectType.none:
                     cb && cb();

+ 1 - 0
assets/script/game/data/AdData.ts

@@ -248,4 +248,5 @@ export enum AdFun {
     bigCash = 6,        //福袋视频
     cashOutNoviceWelfare = 7, //钱包提现新手福利视频
     cashOutAddCash = 8, //钱包提现加现金视频
+    harvest = 9,        //收获超级加倍视频
 }

+ 3 - 0
assets/script/game/data/GData.ts

@@ -28,6 +28,7 @@ import { NewCashUIData } from "./module/NewCashUIData";
 import ADUnlockData from "../../before/view/data/ADUnlockData";
 import PlantData from "../../before/view/data/PlantData";
 import { FarmSystem } from "../../before/main/FarmSystem";
+import HarvestData from "../../before/view/data/HarvestData";
 
 /**
  * 数据集合全局类
@@ -80,6 +81,7 @@ class GData {
     public adUnlockData: ADUnlockData;
     public plantData: PlantData;
     public farmSystem: FarmSystem;
+    public harvestData: HarvestData;
 
     public moduleData: Map<number, Data>;
 
@@ -114,6 +116,7 @@ class GData {
         this.newCashUiData = new NewCashUIData();
         this.adUnlockData = new ADUnlockData();
         this.plantData = new PlantData();
+        this.harvestData = new HarvestData();
 
         this.farmSystem = new FarmSystem();
 

+ 5 - 4
assets/script/game/data/GameData.ts

@@ -287,6 +287,7 @@ export class GameData {
         for (var i = 0; i < len; i++) {
             if (this._farmData[i].id == id) {
                 this._farmData[i].state = data.state;
+                this._farmData[i].productID = data.productID;
                 this._farmData[i].growSpan = data.growSpan;
                 break;
             }
@@ -312,13 +313,13 @@ export class GameData {
             let data = null;
             for (var i = 0; i < 18; i++) {
                 if (i < 3) {
-                    data = { id: id, state: FarmState.Empty, growSpan: 0 };
+                    data = { id: id, state: FarmState.Empty, productID: 0, growSpan: 0 };
                 }
                 else if (i == 3) {
-                    data = { id: id, state: FarmState.CanUnlock, growSpan: 0 };
+                    data = { id: id, state: FarmState.CanUnlock, productID: 0, growSpan: 0 };
                 }
                 else {
-                    data = { id: id, state: FarmState.Lock, growSpan: 0 };
+                    data = { id: id, state: FarmState.Lock, productID: 0, growSpan: 0 };
                 }
                 this._farmData.push(data);
                 this._farmDataMap.set(id, data);
@@ -562,7 +563,7 @@ class PlayerProp {
     isFirstRedMoney = 0;
 
     //玩家等级
-    gradeLevel = 0;
+    gradeLevel = 1;
 }
 
 /**

+ 1 - 0
assets/script/game/data/LoginData.ts

@@ -194,6 +194,7 @@ export class LoginData {
         if (isFirstIn == null) {
             this.isFirstIn = true;
             mk.storage.setStorage(StorageKey.isFirstIn, 1);
+            mk.data.setTAEventRegister();
         }
 
         if (this.uin != data.uin) {

+ 7 - 0
assets/script/mk/system/DataSystem.ts

@@ -10,6 +10,13 @@ export default class DataSystem {
     }
 
     /**
+     * 数数注册事件
+     */
+    public setTAEventRegister() {
+        JsbSystem.setTAEventRegister();
+    }
+
+    /**
      * 数数打点
      * @param eventId 事件Id
      * @param des     事件内容

+ 7 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -137,6 +137,13 @@ public class ThirdSdkMgr {
 
     //埋点相关---------------------------------------------------------------------------------------
     /**
+     * 注册事件埋点
+     */
+    public static void setTAEventRegister(){
+        TDSDKMgr.getInstance().setTAEventRegister();
+    }
+
+    /**
      * 埋点
      * @param eventID
      * @param des

+ 0 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -39,9 +39,6 @@ public class TDSDKMgr {
         TDConfig config = TDConfig.getInstance(this.appActivity, TA_APP_ID, TA_SERVER_URL);
         // 初始化 SDK
         this.TDInstance = ThinkingAnalyticsSDK.sharedInstance(config);
-
-        //数数注册
-        TDSDKMgr.getInstance().setTAEventRegister();
     }
 
     public void setTAEvent(String eventID, String des) {

File diff suppressed because it is too large
+ 492 - 117
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 2 - 2
packages-hot-update/cfg.json

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1629353288099,
-    "genTime": 1629353288099,
+    "buildTime": 1629421751469,
+    "genTime": 1629421751469,
     "genVersion": null
 }

Some files were not shown because too many files changed in this diff