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

assets/resources/animation/fadeUp.anim

@@ -0,0 +1,35 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "fadeUp",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "y": [
+        {
+          "frame": 0,
+          "value": 0
+        },
+        {
+          "frame": 1,
+          "value": 60
+        }
+      ],
+      "opacity": [
+        {
+          "frame": 0,
+          "value": 255
+        },
+        {
+          "frame": 1,
+          "value": 0
+        }
+      ]
+    }
+  },
+  "events": []
+}

assets/resources/animation/fadeUp.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "7ed7c68f-a943-47b4-83fe-aa7df7e01c96",
+  "subMetas": {}
+}

assets/resources/data/guide_data.json

@@ -60,13 +60,13 @@
 		"trigger": "1",
 		"trNum": "0",
 		"trForm": "3",
-		"dialogPos": ":0::::",
+		"dialogPos": ":-50::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>",
 		"displayRect": "",
 		"clickRect": "all",
-		"finger": "100:-250",
+		"finger": "100:-280",
 		"lagNext": "1"
 	},
 	{

assets/resources/game/coregame/coregame.prefab

@@ -37122,7 +37122,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -42335,7 +42335,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -47676,7 +47676,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -52886,7 +52886,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -58099,7 +58099,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -63440,7 +63440,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -68650,7 +68650,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -73863,7 +73863,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -79204,7 +79204,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -84414,7 +84414,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -89627,7 +89627,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -94968,7 +94968,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -100178,7 +100178,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -105391,7 +105391,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -110732,7 +110732,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -115942,7 +115942,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -121155,7 +121155,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,
@@ -126496,7 +126496,7 @@
       "ctor": "Float64Array",
       "array": [
         5,
-        13,
+        -10,
         0,
         0,
         0,

assets/resources/game/prefab/ProductShow1.prefab

@@ -0,0 +1,347 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ProductShow1",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_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,
+        30,
+        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": "whiteLight",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 70,
+      "height": 70
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f85d8cce-3f57-4bbd-b368-0d2ee236d19a@6c48a"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "df0d0786-1cb3-4565-9839-ba697e700e24"
+    },
+    "_clips": [
+      {
+        "__uuid__": "df0d0786-1cb3-4565-9839-ba697e700e24"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "07c72c72-a7d3-430f-9dbd-ef782b19b22b"
+    },
+    "fileId": "40pfSwb2lDQJYQ/KvXwIuP",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "factory_20004",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 94
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.4,
+        0.4,
+        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__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f6453d2b-2afb-48e8-9c15-e8d66cce5962"
+    },
+    "_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__": "07c72c72-a7d3-430f-9dbd-ef782b19b22b"
+    },
+    "fileId": "ec+Dt9q81HqbikpvcAOq6F",
+    "sync": false
+  },
+  {
+    "__type__": "bdb4cbzMa9EJ4AUwcV17EQN",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "moveOffset": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 6,
+      "z": 0
+    },
+    "duration": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "07c72c72-a7d3-430f-9dbd-ef782b19b22b"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/ProductShow1.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "07c72c72-a7d3-430f-9dbd-ef782b19b22b",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/speedUpUI/productReward.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "completeImmediately",
+    "_name": "productReward",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -750,7 +750,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -397.676,
+        -361.308,
         0,
         0,
         0,
@@ -1698,7 +1698,9 @@
       "__id__": 1
     },
     "_enabled": true,
-    "lbl_times": null,
+    "lbl_times": {
+      "__id__": 34
+    },
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/texture/btn_2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 105,
-  "height": 48,
+  "width": 170,
+  "height": 60,
   "platformSettings": {},
   "subMetas": {
     "btn_2": {

assets/script/before/main/FarmCountDown.ts

@@ -83,7 +83,7 @@ export class FarmCountDown extends cc.Component {
     /** 设置显示
      * @param state 0 生虫 1 成熟
      */
-    setState(state) {
+    async setState(state) {
         this.normalProgress.fillRange = 0;
         this.normalCount.string = '';
         this.normalGroup.active = false;

assets/script/before/main/FarmIcon.ts

@@ -1,5 +1,6 @@
 import { ExpAddType, FarmState, GameProp, ProductType } from '../../game/data/GameData';
 import { MoveToCenter } from '../map/MoveToCenter';
+import ProductShow from '../view/ProductShow';
 import { FarmCountDown } from './FarmCountDown';
 import { FarmGrowProcess } from './FarmGrowProcess';
 import { IDHelper } from './IDHelper';
@@ -48,7 +49,7 @@ export class FarmIcon extends cc.Component {
         this.setState(this.data.state);
     }
 
-    private setState(value: FarmState): void {
+    private async setState(value: FarmState) {
         if (this.state != value) {
             this._state = value;
             this.lockNode.active = false;
@@ -85,6 +86,11 @@ export class FarmIcon extends cc.Component {
                     this.process.node.active = true;
                     this.countDown.setState(1);
                     this.process.setData(this.data);
+
+                    let prefab = await mk.loader.load("game/prefab/ProductShow1", cc.Prefab);
+                    let item = cc.instantiate(prefab);
+                    item.name = 'hb';
+                    item.parent = this.node;
                     break;
                 case FarmState.Sick:
                     this.plantIcon.node.active = true;
@@ -145,6 +151,8 @@ export class FarmIcon extends cc.Component {
         gData.gameData.setFarmDataMap(this.configID, this.data);
         gData.gameData.setNextProduct(false);
         gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
+        let child = this.node.getChildByName('hb');
+        this.node.removeChild(child);
     }
 
     public async plant(id: number) {
@@ -171,7 +179,7 @@ export class FarmIcon extends cc.Component {
     }
 
     /** 成熟 */
-    public onRiped(): void {
+    public async onRiped() {
         this._state = FarmState.Ripe;
         this.data.state = FarmState.Ripe;
         gData.gameData.setFarmDataMap(this.configID, this.data);

assets/script/before/map/MapMove.ts

@@ -17,7 +17,7 @@ export class MapMove extends cc.Component {
         this.canvas = cc.find('Canvas');
         this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
 
-        //初始地图位置
+        this.map.scale = 1.2;
         this.node.setPosition(cc.v2(72, 348));
     }
 

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

@@ -27,10 +27,10 @@ export default class HarvestData extends Data {
 
     /** 收取后变为空地 */
     setToEmpty() {
-        if (this.call) {
-            this.call();
-            this.call = null;
-        }
+        // if (this.call) {
+        //     this.call();
+        //     this.call = null;
+        // }
 
         mk.ui.closePanel('HarvestPanel');
     }

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

@@ -13,6 +13,12 @@ export default class HarvestPanel extends cc.Component {
         //调用收获红包币接口
         gData.harvestData.setToEmpty();
         gData.adData.checkShowFullInter(1);
+
+        //奖励弹窗
+        let rewardData = [{ rewardType: 1, rewardNum: 20 }];
+        gData.reward.data = rewardData;
+        gData.reward.callback = gData.harvestData.call;
+        mk.ui.openPanel('module/reward/reward');
     }
 
     public async clickSuperBtn() {
@@ -23,6 +29,12 @@ export default class HarvestPanel extends cc.Component {
                 await gData.adData.watchVideo(AdFun.harvest);
                 gData.harvestData.setToEmpty();
                 // mk.ad.destroyNativeAd();
+
+                //奖励弹窗
+                let rewardData = [{ rewardType: 1, rewardNum: 20 }];
+                gData.reward.data = rewardData;
+                gData.reward.callback = gData.harvestData.call;
+                mk.ui.openPanel('module/reward/reward');
             }
         });
     }

assets/script/game/component/BangsFit.ts

@@ -24,7 +24,7 @@ export default class BangsFit extends cc.Component {
         let is_big = this.IsBigScreenRatio();
         if (is_big) {
             widget.top = LeftPadding;
-            widget.bottom = RightPadding;
+            // widget.bottom = RightPadding;
         }
     }
 

assets/script/game/data/AdData.ts

@@ -317,11 +317,7 @@ export class AdData {
     private test = true;
     /** 定时弹出红包 */
     startPopRed(dt) {
-        if(this.test)
-        {
-            return;
-        }
-        if (mk.guide.isGuiding()) {
+        if (mk.guide.isGuiding() || mk.ui.getCurOnPanel('redBagTask') || mk.ui.getCurOnPanel('productReward2')) {
             this.timeAd = 0;
             return;
         }

assets/script/game/data/GameData.ts

@@ -35,6 +35,8 @@ export class GameData {
     /** 标志位：刷新主界面头像 */
     public init_head: boolean = false;
 
+    public init_add: boolean = false;
+
     /** 标志位：刷新主界面红点 */
     public init_red_point: boolean = true;
     //标志位，刷新提现界面的红包币

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

@@ -19,6 +19,8 @@ export class RewardData extends Data {
         return this._data;
     }
 
+    /** 回调函数 */
+    public callback = null;
     /**
      * 气泡子红包类型
      * - 1 主界面气泡、关卡气泡
@@ -47,13 +49,13 @@ export class RewardData extends Data {
         gData.reward.data = [];
     }
 
-    public flyCoinAnim(startPos_node : cc.Node = null) {
+    public flyCoinAnim(startPos_node: cc.Node = null) {
         if (!gData.reward.data || !gData.reward.data.length) return;
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
-            if (gData.reward.data[i].rewardNum == 0) continue;        
+            if (gData.reward.data[i].rewardNum == 0) continue;
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, startPos_node, '', () => {
                 is_add_money && this.addReward();
             })

assets/script/game/game/Game.ts

@@ -63,6 +63,8 @@ export default class Game extends cc.Component {
     lbl_farmLevel: cc.Label = null;
     @property({ type: cc.Sprite, displayName: '等级进度' })
     sp_levelPer: cc.Sprite = null;
+    @property({ type: cc.Animation, displayName: '增加效果文本' })
+    ani_add: cc.Animation = null;
 
 
     /** 是否开始增加次数倒计时 */
@@ -70,6 +72,7 @@ export default class Game extends cc.Component {
     private span = 0;
 
     onLoad() {
+        this.ani_add.node.active = false;
         gData.gameData.gameStyle = this;
         mk.ui.closePanel("login", () => {
             mk.ui.closePanel("agreementTip");
@@ -396,6 +399,8 @@ export default class Game extends cc.Component {
             gData.gameData.gameData.gradeLevel = data.farmLevel;
             gData.gameData.gameData.farmExpValue = data.userExp;
             gData.gameData.gameData.farmGradeData = data.userFarmGrageRewardInfo;
+            // gData.gameData.init_add = true;
+            this.playAdd();
         })
     }
 
@@ -407,5 +412,11 @@ export default class Game extends cc.Component {
             mk.ui.openPanel('module/speedUpUI/productReward2');
         }
     }
+
+    private playAdd() {
+        this.ani_add.node.active = true;
+        this.ani_add.play();
+        // gData.gameData.init_add = false;
+    }
 }
 

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

@@ -260,6 +260,10 @@ export default class Reward extends cc.Component {
     private clickGetReward() {
         cc.log('获取奖励：', gData.reward.data);
         gData.reward.flyCoinAnim(this.node_hb);
+        if (gData.reward.callback) {
+            gData.reward.callback();
+            gData.reward.callback = null;
+        }
         this.onClickClose();
         if (gData.gameData.getProp(GameProp.videoTimes) == 0) {
             mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");

assets/script/mk/system/FlySystem.ts

@@ -12,7 +12,7 @@ export default class FlySystem extends cc.Component {
         mk.fly = this;
     }
 
-    private is_new_cb = true;
+    private is_new_cbArr = [];
     /**
      * @param type 类型 道具id  10001，10002
      * @param num 特效数量
@@ -21,25 +21,24 @@ export default class FlySystem extends cc.Component {
      * @param cb 动画结束回调
     */
     public async PlayCoinAnim(type: number = 0, num: number, startpos_node: cc.Node, endpos: cc.Vec2 | string = '', item_cb: Function = null, isScale: number = -1, averageValue: number = -1) {
+        this.is_new_cbArr[type] = true;
         for (let i = 0; i < num; i++) {
             let copyCoin = await mk.pool.getPrefab('game/prefab/coin');
             let url = 'game/texture/coin/' + type;
             let sf = await mk.loader.load(url, cc.SpriteFrame);
             copyCoin.getComponent(cc.Sprite).spriteFrame = sf;
             copyCoin.setParent(this.node);
-            if(isScale != -1)
-            {
+            if (isScale != -1) {
                 copyCoin.scale = isScale;
-            }else{
+            } else {
                 copyCoin.scale = mk.math.random(0.56, 0.84, false);
-            }  
+            }
             copyCoin.angle = mk.math.random(-45, 45, false);
             let dir = cc.v2(mk.math.random(-1, 1, false), mk.math.random(-1, 1, false));
             dir = dir.normalize();
             let deltaInit = cc.v2(mk.math.random(10, 160, false) * dir.x, mk.math.random(10, 160, false) * dir.y);
             let pos = new cc.Vec2(0, -300);
-            if(startpos_node)
-            {
+            if (startpos_node) {
                 let world_Pos = startpos_node.parent.convertToWorldSpaceAR(startpos_node.getPosition());
                 pos = this.node.convertToNodeSpaceAR(world_Pos);
             }
@@ -48,7 +47,6 @@ export default class FlySystem extends cc.Component {
 
             this.FlyIn(type, copyCoin, initPos, endpos, item_cb, averageValue);
         }
-        this.is_new_cb = true;
     }
 
     private FlyIn(type: number, target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, item_cb: Function = null, averageValue: number = -1) {
@@ -66,7 +64,7 @@ export default class FlySystem extends cc.Component {
             .to(dur, { scale: 0.8 })
             .start();
 
-            console.log('---');
+        console.log('---');
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {
@@ -97,18 +95,17 @@ export default class FlySystem extends cc.Component {
             .to(dur, { position: cc.v3(end_pos) }, cc.easeSineOut())
             .call(() => {
                 console.log('end_pos  ', target.position)
-                
+
                 // if (end_node) {
                 //     cc.tween(end_node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
                 // }
-                if(averageValue != -1)
-                {
+                if (averageValue != -1) {
                     this.showLabStrChange(averageValue);
                 }
 
                 if (item_cb != null) {
-                    this.is_new_cb && item_cb();
-                    this.is_new_cb = false;
+                    this.is_new_cbArr[type] && item_cb();
+                    this.is_new_cbArr[type] = false;
                 }
                 //this.iconScale(type);
 
@@ -133,10 +130,8 @@ export default class FlySystem extends cc.Component {
         cc.tween(node).to(0.1, { scale: 1.3 }).to(0.05, { scale: 1 }).start();
     }
 
-    private showLabStrChange(value: number)
-    {
-        if(gData.gameData.gameStyle.lbl_redMoney)
-        {
+    private showLabStrChange(value: number) {
+        if (gData.gameData.gameStyle.lbl_redMoney) {
             gData.gameData.gameData.redMoney += value;
             //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.gameData.redMoney.toString();
             //cc.tween(gData.gameData.gameStyle.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
@@ -152,8 +147,7 @@ export default class FlySystem extends cc.Component {
      * @param offsetPos 相对终点的偏移值
      */
 
-    public playFlyAni(startTarget: cc.Node, cloneTarget: cc.Node, endTarget: cc.Node, duration: number, callFuc: Function|null = null, offsetPos: cc.Vec3 = cc.Vec3.ZERO)
-    {
+    public playFlyAni(startTarget: cc.Node, cloneTarget: cc.Node, endTarget: cc.Node, duration: number, callFuc: Function | null = null, offsetPos: cc.Vec3 = cc.Vec3.ZERO) {
         let worldPos = startTarget.parent.convertToWorldSpaceAR(startTarget.getPosition());
         let pos = endTarget.parent.convertToNodeSpaceAR(worldPos);
         let newNode = cc.instantiate(cloneTarget);
@@ -171,11 +165,10 @@ export default class FlySystem extends cc.Component {
         let endPos = cc.Vec3.ZERO;
         endPos.add(offsetPos, endPos);
 
-        cc.tween(newNode).to(duration, { position: cc.v3(endPos) }, cc.easeSineOut()).call(()=>{    
-            if(callFuc)
-            {
+        cc.tween(newNode).to(duration, { position: cc.v3(endPos) }, cc.easeSineOut()).call(() => {
+            if (callFuc) {
                 callFuc();
-            }      
+            }
             newNode.destroy();
         }).start();
     }

build/jsb-link/assets/resources/import/07/07c72c72-a7d3-430f-9dbd-ef782b19b22b.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","dfDQeGHLNFZZg5uml+cA4k","f85d8cce-3f57-4bbd-b368-0d2ee236d19a@6c48a","f6RT0rKvtI6JwV6NZszlli"],["node","_spriteFrame","_defaultClip","root","data"],[["cc.Node",["_name","_components","_prefab","_trs","_parent","_contentSize","_children"],2,9,4,7,1,5,2],["cc.Sprite",["_sizeMode","node","_materials","_spriteFrame"],2,1,3,6],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Animation",["playOnLoad","node","_clips","_defaultClip"],2,1,3,6],["bdb4cbzMa9EJ4AUwcV17EQN",["duration","node","moveOffset"],2,1,5]],[[2,0,1,2],[3,0,2],[0,0,6,1,2,3,2],[0,0,4,1,2,5,2],[0,0,4,1,2,5,3,2],[1,0,1,2,3,2],[1,1,2,3,1],[4,0,1,2,3,2],[2,1,1],[5,0,1,2,2]],[[1,"ProductShow1"],[2,"ProductShow1",[-3,-4],[[9,1,-2,[1,0,6,0]]],[8,-1],[0,30,0,0,0,0,1,1,1,1]],[3,"whiteLight",1,[[5,0,-5,[0],1],[7,true,-6,[3],2]],[0,"40pfSwb2lDQJYQ/KvXwIuP",1],[5,70,70]],[4,"factory_20004",1,[[6,-7,[4],5]],[0,"ec+Dt9q81HqbikpvcAOq6F",1],[5,80,94],[0,0,0,0,0,0,1,0.4,0.4,1]]],0,[0,3,1,0,0,1,0,-1,2,0,-2,3,0,0,2,0,0,2,0,0,3,0,4,1,7],[0,0,0,0,0,0],[-1,1,2,-1,-1,1],[0,2,1,1,0,3]]

build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json

@@ -1 +1 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"1"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-250","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"1"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"1","dialog":"<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"},{"id":"2_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":300::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>完成任务必得现金，最\n高可以提现100元哦！</color>","displayRect":"0:200:500:300","clickRect":"all","finger":"100:-100","lagNext":"1"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":":-50::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json

@@ -1 +1 @@
-[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\r\nzhuanpan.png\r\nsize: 175,101\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\nbg\r\n  rotate: false\r\n  xy: 2, 2\r\n  size: 97, 97\r\n  orig: 97, 97\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan\r\n  rotate: false\r\n  xy: 101, 27\r\n  size: 72, 72\r\n  orig: 72, 72\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan1\r\n  rotate: false\r\n  xy: 101, 2\r\n  size: 20, 23\r\n  orig: 21, 24\r\n  offset: 0, 1\r\n  index: -1\r\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\nzhuanpan.png\nsize: 175,101\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\nbg\n  rotate: false\n  xy: 2, 2\n  size: 97, 97\n  orig: 97, 97\n  offset: 0, 0\n  index: -1\nzhuanpan\n  rotate: false\n  xy: 101, 27\n  size: 72, 72\n  orig: 72, 72\n  offset: 0, 0\n  index: -1\nzhuanpan1\n  rotate: false\n  xy: 101, 2\n  size: 20, 23\n  orig: 21, 24\n  offset: 0, 1\n  index: -1\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]

build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json

@@ -1 +1 @@
-[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\r\nlight.png\r\nsize: 1382,1360\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\ndeng1\r\n  rotate: true\r\n  xy: 2, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng2\r\n  rotate: true\r\n  xy: 688, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\ndeng3\r\n  rotate: true\r\n  xy: 692, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng4\r\n  rotate: true\r\n  xy: 2, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\nlight.png\nsize: 1382,1360\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\ndeng1\n  rotate: true\n  xy: 2, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng2\n  rotate: true\n  xy: 688, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\ndeng3\n  rotate: true\n  xy: 692, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng4\n  rotate: true\n  xy: 2, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]

build/jsb-link/assets/resources/import/7e/7ed7c68f-a943-47b4-83fe-aa7df7e01c96.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AnimationClip",["_name","_duration","curveData"],0]],[[0,0,1,2,4]],[[0,"fadeUp",1,{"props":{"y":[{"frame":0,"value":0},{"frame":1,"value":60}],"opacity":[{"frame":0,"value":255},{"frame":1,"value":0}]}}]],0,0,[],[],[]]

build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas

@@ -1,27 +1,27 @@
-
-zhuanpan.png
-size: 175,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-zhuanpan
-  rotate: false
-  xy: 101, 27
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-zhuanpan1
-  rotate: false
-  xy: 101, 2
-  size: 20, 23
-  orig: 21, 24
-  offset: 0, 1
-  index: -1
+
+zhuanpan.png
+size: 175,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+zhuanpan
+  rotate: false
+  xy: 101, 27
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+zhuanpan1
+  rotate: false
+  xy: 101, 2
+  size: 20, 23
+  orig: 21, 24
+  offset: 0, 1
+  index: -1

build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas

@@ -1,34 +1,34 @@
-
-libao.png
-size: 234,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-lihe-1
-  rotate: false
-  xy: 101, 42
-  size: 78, 57
-  orig: 78, 57
-  offset: 0, 0
-  index: -1
-lihe-2
-  rotate: true
-  xy: 181, 26
-  size: 73, 51
-  orig: 74, 51
-  offset: 1, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 8
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+libao.png
+size: 234,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+lihe-1
+  rotate: false
+  xy: 101, 42
+  size: 78, 57
+  orig: 78, 57
+  offset: 0, 0
+  index: -1
+lihe-2
+  rotate: true
+  xy: 181, 26
+  size: 73, 51
+  orig: 74, 51
+  offset: 1, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 8
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas

@@ -1,34 +1,34 @@
-
-light.png
-size: 1382,1360
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-deng1
-  rotate: true
-  xy: 2, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng2
-  rotate: true
-  xy: 688, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
-deng3
-  rotate: true
-  xy: 692, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng4
-  rotate: true
-  xy: 2, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
+
+light.png
+size: 1382,1360
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+deng1
+  rotate: true
+  xy: 2, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng2
+  rotate: true
+  xy: 688, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1
+deng3
+  rotate: true
+  xy: 692, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng4
+  rotate: true
+  xy: 2, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1

build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas

@@ -1,244 +1,244 @@
-
-pandan.png
-size: 1848,400
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-baoxiang
-  rotate: true
-  xy: 692, 162
-  size: 236, 191
-  orig: 236, 191
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 468, 147
-  size: 222, 251
-  orig: 222, 251
-  offset: 0, 0
-  index: -1
-ditan
-  rotate: false
-  xy: 1050, 2
-  size: 464, 164
-  orig: 464, 164
-  offset: 0, 0
-  index: -1
-dudou
-  rotate: true
-  xy: 1113, 238
-  size: 160, 129
-  orig: 162, 131
-  offset: 1, 1
-  index: -1
-erduo
-  rotate: true
-  xy: 310, 37
-  size: 361, 156
-  orig: 361, 156
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: true
-  xy: 566, 8
-  size: 137, 145
-  orig: 144, 154
-  offset: 5, 4
-  index: -1
-eye1-2
-  rotate: true
-  xy: 1244, 246
-  size: 152, 151
-  orig: 156, 158
-  offset: 2, 3
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1496, 169
-  size: 97, 110
-  orig: 99, 112
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: false
-  xy: 468, 37
-  size: 96, 108
-  orig: 98, 110
-  offset: 1, 1
-  index: -1
-eye2-3
-  rotate: false
-  xy: 1490, 268
-  size: 122, 130
-  orig: 124, 132
-  offset: 1, 1
-  index: -1
-eye3-1
-  rotate: false
-  xy: 1089, 171
-  size: 118, 59
-  orig: 120, 61
-  offset: 1, 1
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1209, 177
-  size: 101, 59
-  orig: 103, 61
-  offset: 1, 1
-  index: -1
-eye4-4
-  rotate: false
-  xy: 1516, 37
-  size: 122, 130
-  orig: 125, 132
-  offset: 2, 1
-  index: -1
-face
-  rotate: true
-  xy: 2, 21
-  size: 377, 306
-  orig: 377, 306
-  offset: 0, 0
-  index: -1
-jinbi
-  rotate: false
-  xy: 480, 12
-  size: 58, 23
-  orig: 59, 23
-  offset: 0, 0
-  index: -1
-jinbi1
-  rotate: false
-  xy: 1640, 113
-  size: 76, 55
-  orig: 76, 55
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: false
-  xy: 349, 10
-  size: 67, 25
-  orig: 70, 27
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 418, 12
-  size: 60, 23
-  orig: 62, 25
-  offset: 1, 1
-  index: -1
-naiping
-  rotate: false
-  xy: 833, 7
-  size: 215, 153
-  orig: 217, 155
-  offset: 1, 1
-  index: -1
-naizui
-  rotate: true
-  xy: 1608, 170
-  size: 96, 116
-  orig: 99, 118
-  offset: 1, 1
-  index: -1
-shou2
-  rotate: false
-  xy: 1397, 252
-  size: 91, 146
-  orig: 97, 148
-  offset: 1, 1
-  index: -1
-shou3
-  rotate: true
-  xy: 713, 6
-  size: 154, 118
-  orig: 156, 120
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 957, 168
-  size: 130, 60
-  orig: 133, 63
-  offset: 1, 2
-  index: -1
-tui1
-  rotate: false
-  xy: 1733, 65
-  size: 112, 96
-  orig: 114, 98
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: true
-  xy: 1614, 268
-  size: 130, 92
-  orig: 132, 94
-  offset: 1, 1
-  index: -1
-xing
-  rotate: true
-  xy: 310, 3
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
-youshou_1
-  rotate: false
-  xy: 957, 230
-  size: 77, 168
-  orig: 78, 174
-  offset: 0, 6
-  index: -1
-youshouzhang
-  rotate: true
-  xy: 1312, 168
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
-yy
-  rotate: true
-  xy: 885, 182
-  size: 216, 70
-  orig: 216, 70
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: true
-  xy: 1726, 163
-  size: 105, 120
-  orig: 115, 125
-  offset: 3, 4
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1640, 6
-  size: 105, 91
-  orig: 115, 96
-  offset: 3, 4
-  index: -1
-zui2-1
-  rotate: true
-  xy: 1708, 270
-  size: 128, 120
-  orig: 138, 125
-  offset: 5, 4
-  index: -1
-zuoshou_1
-  rotate: false
-  xy: 1036, 232
-  size: 75, 166
-  orig: 78, 174
-  offset: 3, 8
-  index: -1
-zuoshouzhang
-  rotate: true
-  xy: 1404, 174
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
+
+pandan.png
+size: 1848,400
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baoxiang
+  rotate: true
+  xy: 692, 162
+  size: 236, 191
+  orig: 236, 191
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 468, 147
+  size: 222, 251
+  orig: 222, 251
+  offset: 0, 0
+  index: -1
+ditan
+  rotate: false
+  xy: 1050, 2
+  size: 464, 164
+  orig: 464, 164
+  offset: 0, 0
+  index: -1
+dudou
+  rotate: true
+  xy: 1113, 238
+  size: 160, 129
+  orig: 162, 131
+  offset: 1, 1
+  index: -1
+erduo
+  rotate: true
+  xy: 310, 37
+  size: 361, 156
+  orig: 361, 156
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: true
+  xy: 566, 8
+  size: 137, 145
+  orig: 144, 154
+  offset: 5, 4
+  index: -1
+eye1-2
+  rotate: true
+  xy: 1244, 246
+  size: 152, 151
+  orig: 156, 158
+  offset: 2, 3
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1496, 169
+  size: 97, 110
+  orig: 99, 112
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: false
+  xy: 468, 37
+  size: 96, 108
+  orig: 98, 110
+  offset: 1, 1
+  index: -1
+eye2-3
+  rotate: false
+  xy: 1490, 268
+  size: 122, 130
+  orig: 124, 132
+  offset: 1, 1
+  index: -1
+eye3-1
+  rotate: false
+  xy: 1089, 171
+  size: 118, 59
+  orig: 120, 61
+  offset: 1, 1
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1209, 177
+  size: 101, 59
+  orig: 103, 61
+  offset: 1, 1
+  index: -1
+eye4-4
+  rotate: false
+  xy: 1516, 37
+  size: 122, 130
+  orig: 125, 132
+  offset: 2, 1
+  index: -1
+face
+  rotate: true
+  xy: 2, 21
+  size: 377, 306
+  orig: 377, 306
+  offset: 0, 0
+  index: -1
+jinbi
+  rotate: false
+  xy: 480, 12
+  size: 58, 23
+  orig: 59, 23
+  offset: 0, 0
+  index: -1
+jinbi1
+  rotate: false
+  xy: 1640, 113
+  size: 76, 55
+  orig: 76, 55
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: false
+  xy: 349, 10
+  size: 67, 25
+  orig: 70, 27
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 418, 12
+  size: 60, 23
+  orig: 62, 25
+  offset: 1, 1
+  index: -1
+naiping
+  rotate: false
+  xy: 833, 7
+  size: 215, 153
+  orig: 217, 155
+  offset: 1, 1
+  index: -1
+naizui
+  rotate: true
+  xy: 1608, 170
+  size: 96, 116
+  orig: 99, 118
+  offset: 1, 1
+  index: -1
+shou2
+  rotate: false
+  xy: 1397, 252
+  size: 91, 146
+  orig: 97, 148
+  offset: 1, 1
+  index: -1
+shou3
+  rotate: true
+  xy: 713, 6
+  size: 154, 118
+  orig: 156, 120
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 957, 168
+  size: 130, 60
+  orig: 133, 63
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: false
+  xy: 1733, 65
+  size: 112, 96
+  orig: 114, 98
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: true
+  xy: 1614, 268
+  size: 130, 92
+  orig: 132, 94
+  offset: 1, 1
+  index: -1
+xing
+  rotate: true
+  xy: 310, 3
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1
+youshou_1
+  rotate: false
+  xy: 957, 230
+  size: 77, 168
+  orig: 78, 174
+  offset: 0, 6
+  index: -1
+youshouzhang
+  rotate: true
+  xy: 1312, 168
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1
+yy
+  rotate: true
+  xy: 885, 182
+  size: 216, 70
+  orig: 216, 70
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: true
+  xy: 1726, 163
+  size: 105, 120
+  orig: 115, 125
+  offset: 3, 4
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1640, 6
+  size: 105, 91
+  orig: 115, 96
+  offset: 3, 4
+  index: -1
+zui2-1
+  rotate: true
+  xy: 1708, 270
+  size: 128, 120
+  orig: 138, 125
+  offset: 5, 4
+  index: -1
+zuoshou_1
+  rotate: false
+  xy: 1036, 232
+  size: 75, 166
+  orig: 78, 174
+  offset: 3, 8
+  index: -1
+zuoshouzhang
+  rotate: true
+  xy: 1404, 174
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas

@@ -1,20 +1,20 @@
-
-skeleton.png
-size: 323,60
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-hb
-  rotate: false
-  xy: 250, 5
-  size: 71, 53
-  orig: 71, 53
-  offset: 0, 0
-  index: -1
-tuowei
-  rotate: false
-  xy: 2, 2
-  size: 246, 56
-  orig: 254, 58
-  offset: 2, 1
-  index: -1
+
+skeleton.png
+size: 323,60
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+hb
+  rotate: false
+  xy: 250, 5
+  size: 71, 53
+  orig: 71, 53
+  offset: 0, 0
+  index: -1
+tuowei
+  rotate: false
+  xy: 2, 2
+  size: 246, 56
+  orig: 254, 58
+  offset: 2, 1
+  index: -1

build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas

@@ -1,419 +1,419 @@
-
-loading.png
-size: 2017,1540
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bei
-  rotate: false
-  xy: 1959, 892
-  size: 49, 67
-  orig: 52, 70
-  offset: 2, 1
-  index: -1
-beijing
-  rotate: true
-  xy: 2, 786
-  size: 752, 1702
-  orig: 752, 1702
-  offset: 0, 0
-  index: -1
-bizi
-  rotate: true
-  xy: 1924, 438
-  size: 41, 39
-  orig: 43, 42
-  offset: 1, 2
-  index: -1
-caihong
-  rotate: false
-  xy: 2, 63
-  size: 712, 721
-  orig: 738, 735
-  offset: 14, 7
-  index: -1
-chengbao
-  rotate: true
-  xy: 1814, 213
-  size: 223, 190
-  orig: 230, 192
-  offset: 3, 1
-  index: -1
-chuan
-  rotate: false
-  xy: 1837, 12
-  size: 75, 63
-  orig: 77, 65
-  offset: 1, 1
-  index: -1
-er1
-  rotate: false
-  xy: 773, 7
-  size: 52, 52
-  orig: 54, 54
-  offset: 1, 1
-  index: -1
-er2
-  rotate: false
-  xy: 827, 10
-  size: 51, 49
-  orig: 53, 51
-  offset: 1, 1
-  index: -1
-eye1
-  rotate: true
-  xy: 1985, 131
-  size: 80, 30
-  orig: 80, 30
-  offset: 0, 0
-  index: -1
-eye2
-  rotate: true
-  xy: 1951, 105
-  size: 106, 32
-  orig: 108, 34
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 598, 33
-  size: 111, 28
-  orig: 113, 31
-  offset: 1, 2
-  index: -1
-head
-  rotate: true
-  xy: 1289, 16
-  size: 152, 110
-  orig: 154, 113
-  offset: 1, 2
-  index: -1
-kuzi
-  rotate: false
-  xy: 1401, 15
-  size: 95, 58
-  orig: 97, 61
-  offset: 1, 2
-  index: -1
-lang1
-  rotate: false
-  xy: 380, 18
-  size: 216, 43
-  orig: 224, 54
-  offset: 3, 4
-  index: -1
-lang2
-  rotate: false
-  xy: 1757, 77
-  size: 164, 24
-  orig: 170, 34
-  offset: 2, 3
-  index: -1
-lang3
-  rotate: true
-  xy: 1946, 1119
-  size: 174, 46
-  orig: 180, 52
-  offset: 4, 3
-  index: -1
-lang4
-  rotate: true
-  xy: 1946, 1295
-  size: 243, 53
-  orig: 251, 59
-  offset: 5, 3
-  index: -1
-mei1
-  rotate: false
-  xy: 1289, 2
-  size: 28, 12
-  orig: 32, 14
-  offset: 2, 1
-  index: -1
-mei2
-  rotate: false
-  xy: 130, 2
-  size: 28, 10
-  orig: 32, 12
-  offset: 2, 1
-  index: -1
-niao1
-  rotate: false
-  xy: 2, 2
-  size: 126, 59
-  orig: 126, 59
-  offset: 0, 0
-  index: -1
-san
-  rotate: false
-  xy: 1531, 438
-  size: 338, 346
-  orig: 338, 346
-  offset: 0, 0
-  index: -1
-sanying
-  rotate: false
-  xy: 716, 61
-  size: 259, 107
-  orig: 270, 121
-  offset: 8, 8
-  index: -1
-shatan
-  rotate: false
-  xy: 130, 14
-  size: 248, 47
-  orig: 248, 47
-  offset: 0, 0
-  index: -1
-shou1
-  rotate: false
-  xy: 919, 2
-  size: 28, 24
-  orig: 32, 27
-  offset: 2, 2
-  index: -1
-shou2-1
-  rotate: true
-  xy: 1959, 961
-  size: 32, 56
-  orig: 35, 59
-  offset: 1, 1
-  index: -1
-shou2-2
-  rotate: true
-  xy: 1965, 448
-  size: 31, 50
-  orig: 33, 54
-  offset: 1, 3
-  index: -1
-shou3
-  rotate: true
-  xy: 1871, 438
-  size: 41, 51
-  orig: 45, 54
-  offset: 2, 2
-  index: -1
-shou4
-  rotate: false
-  xy: 880, 19
-  size: 37, 40
-  orig: 39, 42
-  offset: 1, 1
-  index: -1
-shu1
-  rotate: true
-  xy: 1757, 103
-  size: 108, 192
-  orig: 108, 192
-  offset: 0, 0
-  index: -1
-shu2
-  rotate: false
-  xy: 1871, 607
-  size: 94, 204
-  orig: 94, 204
-  offset: 0, 0
-  index: -1
-shu3
-  rotate: true
-  xy: 977, 2
-  size: 166, 121
-  orig: 166, 121
-  offset: 0, 0
-  index: -1
-shu4
-  rotate: true
-  xy: 1530, 23
-  size: 196, 225
-  orig: 196, 225
-  offset: 0, 0
-  index: -1
-shu5
-  rotate: true
-  xy: 1531, 221
-  size: 215, 281
-  orig: 215, 281
-  offset: 0, 0
-  index: -1
-shu7
-  rotate: true
-  xy: 1923, 19
-  size: 82, 92
-  orig: 82, 92
-  offset: 0, 0
-  index: -1
-shu8
-  rotate: true
-  xy: 1414, 154
-  size: 100, 114
-  orig: 100, 114
-  offset: 0, 0
-  index: -1
-shugan1
-  rotate: false
-  xy: 1706, 1100
-  size: 238, 438
-  orig: 238, 438
-  offset: 0, 0
-  index: -1
-shuying
-  rotate: true
-  xy: 1414, 256
-  size: 528, 115
-  orig: 533, 125
-  offset: 2, 4
-  index: -1
-toufa
-  rotate: false
-  xy: 711, 20
-  size: 60, 39
-  orig: 60, 39
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1959, 836
-  size: 51, 54
-  orig: 51, 54
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: false
-  xy: 1959, 1071
-  size: 56, 46
-  orig: 56, 46
-  offset: 0, 0
-  index: -1
-tuoxie1
-  rotate: false
-  xy: 1498, 36
-  size: 28, 37
-  orig: 30, 40
-  offset: 1, 2
-  index: -1
-tuoxie2
-  rotate: false
-  xy: 919, 28
-  size: 40, 31
-  orig: 42, 34
-  offset: 1, 2
-  index: -1
-xie1
-  rotate: true
-  xy: 1959, 995
-  size: 74, 54
-  orig: 78, 56
-  offset: 2, 1
-  index: -1
-xie10
-  rotate: false
-  xy: 598, 2
-  size: 102, 29
-  orig: 108, 34
-  offset: 3, 3
-  index: -1
-xie2
-  rotate: true
-  xy: 1706, 788
-  size: 23, 32
-  orig: 23, 32
-  offset: 0, 0
-  index: -1
-xie3
-  rotate: true
-  xy: 1740, 788
-  size: 23, 31
-  orig: 23, 31
-  offset: 0, 0
-  index: -1
-xie4
-  rotate: false
-  xy: 1513, 115
-  size: 15, 17
-  orig: 18, 19
-  offset: 2, 1
-  index: -1
-xie5
-  rotate: false
-  xy: 961, 42
-  size: 14, 17
-  orig: 17, 20
-  offset: 1, 1
-  index: -1
-xie6
-  rotate: true
-  xy: 1513, 134
-  size: 18, 15
-  orig: 21, 17
-  offset: 2, 1
-  index: -1
-xie7
-  rotate: true
-  xy: 2001, 1520
-  size: 18, 14
-  orig: 21, 17
-  offset: 1, 1
-  index: -1
-xie8
-  rotate: false
-  xy: 1965, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 2, 1
-  index: -1
-xie9
-  rotate: false
-  xy: 1988, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 1, 1
-  index: -1
-xigua
-  rotate: false
-  xy: 1757, 17
-  size: 78, 58
-  orig: 80, 60
-  offset: 1, 1
-  index: -1
-yguang
-  rotate: false
-  xy: 716, 170
-  size: 696, 614
-  orig: 750, 627
-  offset: 0, 13
-  index: -1
-yifu
-  rotate: false
-  xy: 1401, 75
-  size: 110, 77
-  orig: 110, 84
-  offset: 0, 7
-  index: -1
-yingzi
-  rotate: false
-  xy: 1100, 6
-  size: 187, 162
-  orig: 191, 166
-  offset: 2, 2
-  index: -1
-yizi
-  rotate: false
-  xy: 1706, 813
-  size: 251, 285
-  orig: 255, 288
-  offset: 1, 2
-  index: -1
-zhuozi
-  rotate: true
-  xy: 1871, 481
-  size: 124, 116
-  orig: 126, 118
-  offset: 1, 1
-  index: -1
-zui
-  rotate: true
-  xy: 1985, 106
-  size: 23, 27
-  orig: 32, 30
-  offset: 5, 2
-  index: -1
+
+loading.png
+size: 2017,1540
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bei
+  rotate: false
+  xy: 1959, 892
+  size: 49, 67
+  orig: 52, 70
+  offset: 2, 1
+  index: -1
+beijing
+  rotate: true
+  xy: 2, 786
+  size: 752, 1702
+  orig: 752, 1702
+  offset: 0, 0
+  index: -1
+bizi
+  rotate: true
+  xy: 1924, 438
+  size: 41, 39
+  orig: 43, 42
+  offset: 1, 2
+  index: -1
+caihong
+  rotate: false
+  xy: 2, 63
+  size: 712, 721
+  orig: 738, 735
+  offset: 14, 7
+  index: -1
+chengbao
+  rotate: true
+  xy: 1814, 213
+  size: 223, 190
+  orig: 230, 192
+  offset: 3, 1
+  index: -1
+chuan
+  rotate: false
+  xy: 1837, 12
+  size: 75, 63
+  orig: 77, 65
+  offset: 1, 1
+  index: -1
+er1
+  rotate: false
+  xy: 773, 7
+  size: 52, 52
+  orig: 54, 54
+  offset: 1, 1
+  index: -1
+er2
+  rotate: false
+  xy: 827, 10
+  size: 51, 49
+  orig: 53, 51
+  offset: 1, 1
+  index: -1
+eye1
+  rotate: true
+  xy: 1985, 131
+  size: 80, 30
+  orig: 80, 30
+  offset: 0, 0
+  index: -1
+eye2
+  rotate: true
+  xy: 1951, 105
+  size: 106, 32
+  orig: 108, 34
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 598, 33
+  size: 111, 28
+  orig: 113, 31
+  offset: 1, 2
+  index: -1
+head
+  rotate: true
+  xy: 1289, 16
+  size: 152, 110
+  orig: 154, 113
+  offset: 1, 2
+  index: -1
+kuzi
+  rotate: false
+  xy: 1401, 15
+  size: 95, 58
+  orig: 97, 61
+  offset: 1, 2
+  index: -1
+lang1
+  rotate: false
+  xy: 380, 18
+  size: 216, 43
+  orig: 224, 54
+  offset: 3, 4
+  index: -1
+lang2
+  rotate: false
+  xy: 1757, 77
+  size: 164, 24
+  orig: 170, 34
+  offset: 2, 3
+  index: -1
+lang3
+  rotate: true
+  xy: 1946, 1119
+  size: 174, 46
+  orig: 180, 52
+  offset: 4, 3
+  index: -1
+lang4
+  rotate: true
+  xy: 1946, 1295
+  size: 243, 53
+  orig: 251, 59
+  offset: 5, 3
+  index: -1
+mei1
+  rotate: false
+  xy: 1289, 2
+  size: 28, 12
+  orig: 32, 14
+  offset: 2, 1
+  index: -1
+mei2
+  rotate: false
+  xy: 130, 2
+  size: 28, 10
+  orig: 32, 12
+  offset: 2, 1
+  index: -1
+niao1
+  rotate: false
+  xy: 2, 2
+  size: 126, 59
+  orig: 126, 59
+  offset: 0, 0
+  index: -1
+san
+  rotate: false
+  xy: 1531, 438
+  size: 338, 346
+  orig: 338, 346
+  offset: 0, 0
+  index: -1
+sanying
+  rotate: false
+  xy: 716, 61
+  size: 259, 107
+  orig: 270, 121
+  offset: 8, 8
+  index: -1
+shatan
+  rotate: false
+  xy: 130, 14
+  size: 248, 47
+  orig: 248, 47
+  offset: 0, 0
+  index: -1
+shou1
+  rotate: false
+  xy: 919, 2
+  size: 28, 24
+  orig: 32, 27
+  offset: 2, 2
+  index: -1
+shou2-1
+  rotate: true
+  xy: 1959, 961
+  size: 32, 56
+  orig: 35, 59
+  offset: 1, 1
+  index: -1
+shou2-2
+  rotate: true
+  xy: 1965, 448
+  size: 31, 50
+  orig: 33, 54
+  offset: 1, 3
+  index: -1
+shou3
+  rotate: true
+  xy: 1871, 438
+  size: 41, 51
+  orig: 45, 54
+  offset: 2, 2
+  index: -1
+shou4
+  rotate: false
+  xy: 880, 19
+  size: 37, 40
+  orig: 39, 42
+  offset: 1, 1
+  index: -1
+shu1
+  rotate: true
+  xy: 1757, 103
+  size: 108, 192
+  orig: 108, 192
+  offset: 0, 0
+  index: -1
+shu2
+  rotate: false
+  xy: 1871, 607
+  size: 94, 204
+  orig: 94, 204
+  offset: 0, 0
+  index: -1
+shu3
+  rotate: true
+  xy: 977, 2
+  size: 166, 121
+  orig: 166, 121
+  offset: 0, 0
+  index: -1
+shu4
+  rotate: true
+  xy: 1530, 23
+  size: 196, 225
+  orig: 196, 225
+  offset: 0, 0
+  index: -1
+shu5
+  rotate: true
+  xy: 1531, 221
+  size: 215, 281
+  orig: 215, 281
+  offset: 0, 0
+  index: -1
+shu7
+  rotate: true
+  xy: 1923, 19
+  size: 82, 92
+  orig: 82, 92
+  offset: 0, 0
+  index: -1
+shu8
+  rotate: true
+  xy: 1414, 154
+  size: 100, 114
+  orig: 100, 114
+  offset: 0, 0
+  index: -1
+shugan1
+  rotate: false
+  xy: 1706, 1100
+  size: 238, 438
+  orig: 238, 438
+  offset: 0, 0
+  index: -1
+shuying
+  rotate: true
+  xy: 1414, 256
+  size: 528, 115
+  orig: 533, 125
+  offset: 2, 4
+  index: -1
+toufa
+  rotate: false
+  xy: 711, 20
+  size: 60, 39
+  orig: 60, 39
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1959, 836
+  size: 51, 54
+  orig: 51, 54
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: false
+  xy: 1959, 1071
+  size: 56, 46
+  orig: 56, 46
+  offset: 0, 0
+  index: -1
+tuoxie1
+  rotate: false
+  xy: 1498, 36
+  size: 28, 37
+  orig: 30, 40
+  offset: 1, 2
+  index: -1
+tuoxie2
+  rotate: false
+  xy: 919, 28
+  size: 40, 31
+  orig: 42, 34
+  offset: 1, 2
+  index: -1
+xie1
+  rotate: true
+  xy: 1959, 995
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+xie10
+  rotate: false
+  xy: 598, 2
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+xie2
+  rotate: true
+  xy: 1706, 788
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+xie3
+  rotate: true
+  xy: 1740, 788
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+xie4
+  rotate: false
+  xy: 1513, 115
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+xie5
+  rotate: false
+  xy: 961, 42
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+xie6
+  rotate: true
+  xy: 1513, 134
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+xie7
+  rotate: true
+  xy: 2001, 1520
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+xie8
+  rotate: false
+  xy: 1965, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+xie9
+  rotate: false
+  xy: 1988, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1
+xigua
+  rotate: false
+  xy: 1757, 17
+  size: 78, 58
+  orig: 80, 60
+  offset: 1, 1
+  index: -1
+yguang
+  rotate: false
+  xy: 716, 170
+  size: 696, 614
+  orig: 750, 627
+  offset: 0, 13
+  index: -1
+yifu
+  rotate: false
+  xy: 1401, 75
+  size: 110, 77
+  orig: 110, 84
+  offset: 0, 7
+  index: -1
+yingzi
+  rotate: false
+  xy: 1100, 6
+  size: 187, 162
+  orig: 191, 166
+  offset: 2, 2
+  index: -1
+yizi
+  rotate: false
+  xy: 1706, 813
+  size: 251, 285
+  orig: 255, 288
+  offset: 1, 2
+  index: -1
+zhuozi
+  rotate: true
+  xy: 1871, 481
+  size: 124, 116
+  orig: 126, 118
+  offset: 1, 1
+  index: -1
+zui
+  rotate: true
+  xy: 1985, 106
+  size: 23, 27
+  orig: 32, 30
+  offset: 5, 2
+  index: -1

build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas

@@ -1,335 +1,335 @@
-
-chengnian.png
-size: 1609,780
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-01
-  rotate: true
-  xy: 1201, 339
-  size: 165, 273
-  orig: 165, 273
-  offset: 0, 0
-  index: -1
-03
-  rotate: true
-  xy: 1228, 506
-  size: 272, 291
-  orig: 272, 291
-  offset: 0, 0
-  index: -1
-04
-  rotate: false
-  xy: 2, 109
-  size: 356, 356
-  orig: 356, 356
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 401, 269
-  size: 152, 196
-  orig: 152, 196
-  offset: 0, 0
-  index: -1
-erduo
-  rotate: false
-  xy: 814, 366
-  size: 385, 166
-  orig: 385, 166
-  offset: 0, 0
-  index: -1
-erji1
-  rotate: false
-  xy: 814, 534
-  size: 412, 244
-  orig: 414, 248
-  offset: 1, 3
-  index: -1
-erji2
-  rotate: false
-  xy: 434, 2
-  size: 80, 154
-  orig: 82, 157
-  offset: 1, 1
-  index: -1
-eye1-1
-  rotate: true
-  xy: 1232, 17
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: false
-  xy: 1469, 42
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: false
-  xy: 660, 2
-  size: 109, 104
-  orig: 111, 106
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: false
-  xy: 771, 2
-  size: 109, 104
-  orig: 112, 106
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1406, 37
-  size: 105, 61
-  orig: 107, 63
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: true
-  xy: 1544, 39
-  size: 90, 61
-  orig: 92, 63
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 1350, 209
-  size: 122, 128
-  orig: 127, 133
-  offset: 3, 2
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1474, 196
-  size: 128, 128
-  orig: 132, 133
-  offset: 2, 2
-  index: -1
-eye4-1
-  rotate: false
-  xy: 2, 20
-  size: 337, 87
-  orig: 344, 98
-  offset: 2, 5
-  index: -1
-eye4-2
-  rotate: true
-  xy: 360, 194
-  size: 271, 39
-  orig: 274, 41
-  offset: 1, 1
-  index: -1
-face
-  rotate: false
-  xy: 447, 473
-  size: 365, 305
-  orig: 367, 307
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 962, 137
-  size: 153, 87
-  orig: 153, 87
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: true
-  xy: 360, 122
-  size: 70, 22
-  orig: 72, 24
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 1145, 27
-  size: 60, 21
-  orig: 62, 23
-  offset: 1, 1
-  index: -1
-shou-jita
-  rotate: false
-  xy: 1321, 42
-  size: 83, 100
-  orig: 86, 103
-  offset: 2, 2
-  index: -1
-shou-jita2
-  rotate: false
-  xy: 341, 2
-  size: 91, 105
-  orig: 94, 108
-  offset: 1, 1
-  index: -1
-shou-jita3
-  rotate: false
-  xy: 2, 467
-  size: 443, 311
-  orig: 445, 313
-  offset: 1, 1
-  index: -1
-shou-jita4
-  rotate: false
-  xy: 1232, 92
-  size: 87, 105
-  orig: 113, 111
-  offset: 1, 5
-  index: -1
-shou1
-  rotate: true
-  xy: 555, 243
-  size: 90, 171
-  orig: 98, 173
-  offset: 1, 1
-  index: -1
-shou10
-  rotate: true
-  xy: 728, 235
-  size: 98, 75
-  orig: 100, 77
-  offset: 1, 1
-  index: -1
-shou11
-  rotate: true
-  xy: 401, 158
-  size: 109, 152
-  orig: 112, 154
-  offset: 2, 1
-  index: -1
-shou12
-  rotate: false
-  xy: 1145, 50
-  size: 85, 147
-  orig: 85, 147
-  offset: 0, 0
-  index: -1
-shou2
-  rotate: false
-  xy: 1521, 639
-  size: 86, 139
-  orig: 97, 141
-  offset: 10, 1
-  index: -1
-shou3
-  rotate: false
-  xy: 1521, 498
-  size: 86, 139
-  orig: 96, 141
-  offset: 1, 1
-  index: -1
-shou4
-  rotate: false
-  xy: 1474, 131
-  size: 130, 63
-  orig: 132, 65
-  offset: 1, 1
-  index: -1
-shou5
-  rotate: false
-  xy: 555, 118
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou6
-  rotate: false
-  xy: 810, 241
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou7
-  rotate: true
-  xy: 967, 226
-  size: 138, 151
-  orig: 138, 151
-  offset: 0, 0
-  index: -1
-shou8
-  rotate: true
-  xy: 1198, 199
-  size: 138, 150
-  orig: 138, 150
-  offset: 0, 0
-  index: -1
-shou9
-  rotate: false
-  xy: 1476, 326
-  size: 123, 170
-  orig: 123, 170
-  offset: 0, 0
-  index: -1
-toufa
-  rotate: false
-  xy: 516, 7
-  size: 142, 109
-  orig: 142, 109
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1120, 243
-  size: 76, 121
-  orig: 76, 121
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: true
-  xy: 1350, 144
-  size: 63, 122
-  orig: 63, 122
-  offset: 0, 0
-  index: -1
-weijin1
-  rotate: false
-  xy: 1098, 10
-  size: 45, 125
-  orig: 45, 125
-  offset: 0, 0
-  index: -1
-weijin2
-  rotate: true
-  xy: 726, 335
-  size: 136, 82
-  orig: 139, 85
-  offset: 2, 2
-  index: -1
-yifu
-  rotate: false
-  xy: 555, 335
-  size: 169, 136
-  orig: 169, 136
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: false
-  xy: 712, 108
-  size: 117, 125
-  orig: 133, 131
-  offset: 5, 5
-  index: -1
-zui1-2-2
-  rotate: false
-  xy: 882, 3
-  size: 117, 109
-  orig: 133, 112
-  offset: 5, 2
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1001, 14
-  size: 121, 95
-  orig: 133, 101
-  offset: 5, 5
-  index: -1
-zui2-1
-  rotate: false
-  xy: 831, 114
-  size: 129, 125
-  orig: 158, 131
-  offset: 6, 5
-  index: -1
+
+chengnian.png
+size: 1609,780
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+01
+  rotate: true
+  xy: 1201, 339
+  size: 165, 273
+  orig: 165, 273
+  offset: 0, 0
+  index: -1
+03
+  rotate: true
+  xy: 1228, 506
+  size: 272, 291
+  orig: 272, 291
+  offset: 0, 0
+  index: -1
+04
+  rotate: false
+  xy: 2, 109
+  size: 356, 356
+  orig: 356, 356
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 401, 269
+  size: 152, 196
+  orig: 152, 196
+  offset: 0, 0
+  index: -1
+erduo
+  rotate: false
+  xy: 814, 366
+  size: 385, 166
+  orig: 385, 166
+  offset: 0, 0
+  index: -1
+erji1
+  rotate: false
+  xy: 814, 534
+  size: 412, 244
+  orig: 414, 248
+  offset: 1, 3
+  index: -1
+erji2
+  rotate: false
+  xy: 434, 2
+  size: 80, 154
+  orig: 82, 157
+  offset: 1, 1
+  index: -1
+eye1-1
+  rotate: true
+  xy: 1232, 17
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: false
+  xy: 1469, 42
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: false
+  xy: 660, 2
+  size: 109, 104
+  orig: 111, 106
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: false
+  xy: 771, 2
+  size: 109, 104
+  orig: 112, 106
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1406, 37
+  size: 105, 61
+  orig: 107, 63
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: true
+  xy: 1544, 39
+  size: 90, 61
+  orig: 92, 63
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1350, 209
+  size: 122, 128
+  orig: 127, 133
+  offset: 3, 2
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1474, 196
+  size: 128, 128
+  orig: 132, 133
+  offset: 2, 2
+  index: -1
+eye4-1
+  rotate: false
+  xy: 2, 20
+  size: 337, 87
+  orig: 344, 98
+  offset: 2, 5
+  index: -1
+eye4-2
+  rotate: true
+  xy: 360, 194
+  size: 271, 39
+  orig: 274, 41
+  offset: 1, 1
+  index: -1
+face
+  rotate: false
+  xy: 447, 473
+  size: 365, 305
+  orig: 367, 307
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 962, 137
+  size: 153, 87
+  orig: 153, 87
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: true
+  xy: 360, 122
+  size: 70, 22
+  orig: 72, 24
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 1145, 27
+  size: 60, 21
+  orig: 62, 23
+  offset: 1, 1
+  index: -1
+shou-jita
+  rotate: false
+  xy: 1321, 42
+  size: 83, 100
+  orig: 86, 103
+  offset: 2, 2
+  index: -1
+shou-jita2
+  rotate: false
+  xy: 341, 2
+  size: 91, 105
+  orig: 94, 108
+  offset: 1, 1
+  index: -1
+shou-jita3
+  rotate: false
+  xy: 2, 467
+  size: 443, 311
+  orig: 445, 313
+  offset: 1, 1
+  index: -1
+shou-jita4
+  rotate: false
+  xy: 1232, 92
+  size: 87, 105
+  orig: 113, 111
+  offset: 1, 5
+  index: -1
+shou1
+  rotate: true
+  xy: 555, 243
+  size: 90, 171
+  orig: 98, 173
+  offset: 1, 1
+  index: -1
+shou10
+  rotate: true
+  xy: 728, 235
+  size: 98, 75
+  orig: 100, 77
+  offset: 1, 1
+  index: -1
+shou11
+  rotate: true
+  xy: 401, 158
+  size: 109, 152
+  orig: 112, 154
+  offset: 2, 1
+  index: -1
+shou12
+  rotate: false
+  xy: 1145, 50
+  size: 85, 147
+  orig: 85, 147
+  offset: 0, 0
+  index: -1
+shou2
+  rotate: false
+  xy: 1521, 639
+  size: 86, 139
+  orig: 97, 141
+  offset: 10, 1
+  index: -1
+shou3
+  rotate: false
+  xy: 1521, 498
+  size: 86, 139
+  orig: 96, 141
+  offset: 1, 1
+  index: -1
+shou4
+  rotate: false
+  xy: 1474, 131
+  size: 130, 63
+  orig: 132, 65
+  offset: 1, 1
+  index: -1
+shou5
+  rotate: false
+  xy: 555, 118
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou6
+  rotate: false
+  xy: 810, 241
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou7
+  rotate: true
+  xy: 967, 226
+  size: 138, 151
+  orig: 138, 151
+  offset: 0, 0
+  index: -1
+shou8
+  rotate: true
+  xy: 1198, 199
+  size: 138, 150
+  orig: 138, 150
+  offset: 0, 0
+  index: -1
+shou9
+  rotate: false
+  xy: 1476, 326
+  size: 123, 170
+  orig: 123, 170
+  offset: 0, 0
+  index: -1
+toufa
+  rotate: false
+  xy: 516, 7
+  size: 142, 109
+  orig: 142, 109
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1120, 243
+  size: 76, 121
+  orig: 76, 121
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: true
+  xy: 1350, 144
+  size: 63, 122
+  orig: 63, 122
+  offset: 0, 0
+  index: -1
+weijin1
+  rotate: false
+  xy: 1098, 10
+  size: 45, 125
+  orig: 45, 125
+  offset: 0, 0
+  index: -1
+weijin2
+  rotate: true
+  xy: 726, 335
+  size: 136, 82
+  orig: 139, 85
+  offset: 2, 2
+  index: -1
+yifu
+  rotate: false
+  xy: 555, 335
+  size: 169, 136
+  orig: 169, 136
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: false
+  xy: 712, 108
+  size: 117, 125
+  orig: 133, 131
+  offset: 5, 5
+  index: -1
+zui1-2-2
+  rotate: false
+  xy: 882, 3
+  size: 117, 109
+  orig: 133, 112
+  offset: 5, 2
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1001, 14
+  size: 121, 95
+  orig: 133, 101
+  offset: 5, 5
+  index: -1
+zui2-1
+  rotate: false
+  xy: 831, 114
+  size: 129, 125
+  orig: 158, 131
+  offset: 6, 5
+  index: -1

build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas

@@ -1,251 +1,251 @@
-
-shaonian.png
-size: 1137,528
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-body
-  rotate: true
-  xy: 815, 368
-  size: 158, 173
-  orig: 158, 173
-  offset: 0, 0
-  index: -1
-dengpao
-  rotate: false
-  xy: 2, 3
-  size: 188, 230
-  orig: 201, 236
-  offset: 8, 1
-  index: -1
-erduo
-  rotate: false
-  xy: 387, 362
-  size: 426, 164
-  orig: 426, 164
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: false
-  xy: 1057, 264
-  size: 76, 93
-  orig: 78, 95
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: true
-  xy: 513, 135
-  size: 77, 92
-  orig: 79, 94
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: true
-  xy: 510, 16
-  size: 117, 111
-  orig: 119, 113
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: true
-  xy: 738, 178
-  size: 117, 111
-  orig: 120, 113
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 731, 57
-  size: 114, 65
-  orig: 116, 68
-  offset: 1, 2
-  index: -1
-eye2-2
-  rotate: true
-  xy: 957, 66
-  size: 97, 65
-  orig: 99, 68
-  offset: 1, 2
-  index: -1
-face
-  rotate: false
-  xy: 2, 235
-  size: 383, 291
-  orig: 385, 293
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 355, 147
-  size: 156, 78
-  orig: 156, 78
-  offset: 0, 0
-  index: -1
-lingjin
-  rotate: true
-  xy: 869, 7
-  size: 57, 105
-  orig: 59, 107
-  offset: 1, 1
-  index: -1
-meimao1
-  rotate: false
-  xy: 798, 55
-  size: 69, 24
-  orig: 73, 26
-  offset: 2, 1
-  index: -1
-meimao2
-  rotate: true
-  xy: 780, 298
-  size: 62, 23
-  orig: 64, 25
-  offset: 1, 1
-  index: -1
-shou1-2
-  rotate: false
-  xy: 192, 123
-  size: 161, 110
-  orig: 161, 110
-  offset: 0, 0
-  index: -1
-shou2-2-copy
-  rotate: true
-  xy: 607, 173
-  size: 122, 129
-  orig: 122, 129
-  offset: 0, 0
-  index: -1
-shou3-2
-  rotate: true
-  xy: 387, 227
-  size: 94, 152
-  orig: 101, 154
-  offset: 1, 1
-  index: -1
-shou4-2
-  rotate: true
-  xy: 192, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou4-3
-  rotate: true
-  xy: 316, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou5-1
-  rotate: false
-  xy: 1044, 179
-  size: 84, 83
-  orig: 86, 85
-  offset: 1, 1
-  index: -1
-shou5-2
-  rotate: false
-  xy: 798, 81
-  size: 85, 82
-  orig: 87, 85
-  offset: 1, 1
-  index: -1
-shou6-1
-  rotate: true
-  xy: 440, 18
-  size: 127, 68
-  orig: 129, 70
-  offset: 1, 1
-  index: -1
-shou6-2
-  rotate: true
-  xy: 885, 67
-  size: 96, 70
-  orig: 98, 72
-  offset: 1, 1
-  index: -1
-shou6-3
-  rotate: false
-  xy: 387, 323
-  size: 218, 37
-  orig: 220, 39
-  offset: 1, 1
-  index: -1
-shou6-4
-  rotate: true
-  xy: 623, 5
-  size: 40, 103
-  orig: 42, 105
-  offset: 1, 1
-  index: -1
-shou6-5
-  rotate: false
-  xy: 976, 3
-  size: 87, 61
-  orig: 89, 63
-  offset: 1, 1
-  index: -1
-shou7-1
-  rotate: true
-  xy: 607, 297
-  size: 63, 171
-  orig: 65, 173
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 851, 165
-  size: 112, 93
-  orig: 112, 93
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 541, 214
-  size: 64, 107
-  orig: 66, 109
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: false
-  xy: 1024, 66
-  size: 61, 106
-  orig: 63, 108
-  offset: 1, 1
-  index: -1
-yifu
-  rotate: true
-  xy: 990, 359
-  size: 167, 145
-  orig: 168, 146
-  offset: 1, 1
-  index: -1
-zui1-2
-  rotate: false
-  xy: 851, 260
-  size: 101, 106
-  orig: 112, 112
-  offset: 4, 4
-  index: -1
-zui1-3
-  rotate: false
-  xy: 954, 277
-  size: 101, 80
-  orig: 112, 87
-  offset: 4, 5
-  index: -1
-zui1-4
-  rotate: true
-  xy: 965, 174
-  size: 101, 77
-  orig: 112, 84
-  offset: 4, 5
-  index: -1
-zui2-1
-  rotate: true
-  xy: 623, 47
-  size: 124, 106
-  orig: 134, 112
-  offset: 5, 4
-  index: -1
+
+shaonian.png
+size: 1137,528
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+body
+  rotate: true
+  xy: 815, 368
+  size: 158, 173
+  orig: 158, 173
+  offset: 0, 0
+  index: -1
+dengpao
+  rotate: false
+  xy: 2, 3
+  size: 188, 230
+  orig: 201, 236
+  offset: 8, 1
+  index: -1
+erduo
+  rotate: false
+  xy: 387, 362
+  size: 426, 164
+  orig: 426, 164
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: false
+  xy: 1057, 264
+  size: 76, 93
+  orig: 78, 95
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: true
+  xy: 513, 135
+  size: 77, 92
+  orig: 79, 94
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: true
+  xy: 510, 16
+  size: 117, 111
+  orig: 119, 113
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: true
+  xy: 738, 178
+  size: 117, 111
+  orig: 120, 113
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 731, 57
+  size: 114, 65
+  orig: 116, 68
+  offset: 1, 2
+  index: -1
+eye2-2
+  rotate: true
+  xy: 957, 66
+  size: 97, 65
+  orig: 99, 68
+  offset: 1, 2
+  index: -1
+face
+  rotate: false
+  xy: 2, 235
+  size: 383, 291
+  orig: 385, 293
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 355, 147
+  size: 156, 78
+  orig: 156, 78
+  offset: 0, 0
+  index: -1
+lingjin
+  rotate: true
+  xy: 869, 7
+  size: 57, 105
+  orig: 59, 107
+  offset: 1, 1
+  index: -1
+meimao1
+  rotate: false
+  xy: 798, 55
+  size: 69, 24
+  orig: 73, 26
+  offset: 2, 1
+  index: -1
+meimao2
+  rotate: true
+  xy: 780, 298
+  size: 62, 23
+  orig: 64, 25
+  offset: 1, 1
+  index: -1
+shou1-2
+  rotate: false
+  xy: 192, 123
+  size: 161, 110
+  orig: 161, 110
+  offset: 0, 0
+  index: -1
+shou2-2-copy
+  rotate: true
+  xy: 607, 173
+  size: 122, 129
+  orig: 122, 129
+  offset: 0, 0
+  index: -1
+shou3-2
+  rotate: true
+  xy: 387, 227
+  size: 94, 152
+  orig: 101, 154
+  offset: 1, 1
+  index: -1
+shou4-2
+  rotate: true
+  xy: 192, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou4-3
+  rotate: true
+  xy: 316, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou5-1
+  rotate: false
+  xy: 1044, 179
+  size: 84, 83
+  orig: 86, 85
+  offset: 1, 1
+  index: -1
+shou5-2
+  rotate: false
+  xy: 798, 81
+  size: 85, 82
+  orig: 87, 85
+  offset: 1, 1
+  index: -1
+shou6-1
+  rotate: true
+  xy: 440, 18
+  size: 127, 68
+  orig: 129, 70
+  offset: 1, 1
+  index: -1
+shou6-2
+  rotate: true
+  xy: 885, 67
+  size: 96, 70
+  orig: 98, 72
+  offset: 1, 1
+  index: -1
+shou6-3
+  rotate: false
+  xy: 387, 323
+  size: 218, 37
+  orig: 220, 39
+  offset: 1, 1
+  index: -1
+shou6-4
+  rotate: true
+  xy: 623, 5
+  size: 40, 103
+  orig: 42, 105
+  offset: 1, 1
+  index: -1
+shou6-5
+  rotate: false
+  xy: 976, 3
+  size: 87, 61
+  orig: 89, 63
+  offset: 1, 1
+  index: -1
+shou7-1
+  rotate: true
+  xy: 607, 297
+  size: 63, 171
+  orig: 65, 173
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 851, 165
+  size: 112, 93
+  orig: 112, 93
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 541, 214
+  size: 64, 107
+  orig: 66, 109
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: false
+  xy: 1024, 66
+  size: 61, 106
+  orig: 63, 108
+  offset: 1, 1
+  index: -1
+yifu
+  rotate: true
+  xy: 990, 359
+  size: 167, 145
+  orig: 168, 146
+  offset: 1, 1
+  index: -1
+zui1-2
+  rotate: false
+  xy: 851, 260
+  size: 101, 106
+  orig: 112, 112
+  offset: 4, 4
+  index: -1
+zui1-3
+  rotate: false
+  xy: 954, 277
+  size: 101, 80
+  orig: 112, 87
+  offset: 4, 5
+  index: -1
+zui1-4
+  rotate: true
+  xy: 965, 174
+  size: 101, 77
+  orig: 112, 84
+  offset: 4, 5
+  index: -1
+zui2-1
+  rotate: true
+  xy: 623, 47
+  size: 124, 106
+  orig: 134, 112
+  offset: 5, 4
+  index: -1

build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas

@@ -1,34 +1,34 @@
-
-yaoqing.png
-size: 162,135
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 36
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-hb1
-  rotate: false
-  xy: 101, 61
-  size: 59, 72
-  orig: 62, 75
-  offset: 0, 3
-  index: -1
-hb2
-  rotate: true
-  xy: 101, 8
-  size: 51, 59
-  orig: 52, 60
-  offset: 0, 1
-  index: -1
-xing
-  rotate: true
-  xy: 2, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+yaoqing.png
+size: 162,135
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 36
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+hb1
+  rotate: false
+  xy: 101, 61
+  size: 59, 72
+  orig: 62, 75
+  offset: 0, 3
+  index: -1
+hb2
+  rotate: true
+  xy: 101, 8
+  size: 51, 59
+  orig: 52, 60
+  offset: 0, 1
+  index: -1
+xing
+  rotate: true
+  xy: 2, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 172,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai1
-  rotate: false
-  xy: 101, 9
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-zhu
-  rotate: true
-  xy: 101, 28
-  size: 71, 69
-  orig: 71, 69
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 172,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai1
+  rotate: false
+  xy: 101, 9
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+zhu
+  rotate: true
+  xy: 101, 28
+  size: 71, 69
+  orig: 71, 69
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 427,355
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-icon_hb
-  rotate: false
-  xy: 360, 270
-  size: 65, 83
-  orig: 65, 83
-  offset: 0, 0
-  index: -1
-xing
-  rotate: false
-  xy: 360, 231
-  size: 33, 37
-  orig: 35, 39
-  offset: 1, 1
-  index: -1
-zhu
-  rotate: false
-  xy: 2, 2
-  size: 356, 351
-  orig: 356, 351
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 427,355
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+icon_hb
+  rotate: false
+  xy: 360, 270
+  size: 65, 83
+  orig: 65, 83
+  offset: 0, 0
+  index: -1
+xing
+  rotate: false
+  xy: 360, 231
+  size: 33, 37
+  orig: 35, 39
+  offset: 1, 1
+  index: -1
+zhu
+  rotate: false
+  xy: 2, 2
+  size: 356, 351
+  orig: 356, 351
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas

@@ -1,62 +1,62 @@
-
-skeleton.png
-size: 1386,710
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-1
-  rotate: true
-  xy: 1051, 233
-  size: 136, 131
-  orig: 145, 141
-  offset: 7, 4
-  index: -1
-2
-  rotate: true
-  xy: 355, 4
-  size: 350, 349
-  orig: 359, 359
-  offset: 5, 5
-  index: -1
-3
-  rotate: true
-  xy: 1048, 371
-  size: 337, 336
-  orig: 347, 348
-  offset: 6, 5
-  index: -1
-4
-  rotate: true
-  xy: 707, 367
-  size: 341, 339
-  orig: 350, 349
-  offset: 6, 5
-  index: -1
-5
-  rotate: true
-  xy: 2, 2
-  size: 352, 351
-  orig: 361, 362
-  offset: 5, 5
-  index: -1
-6
-  rotate: false
-  xy: 2, 356
-  size: 352, 352
-  orig: 359, 362
-  offset: 3, 5
-  index: -1
-7
-  rotate: false
-  xy: 356, 359
-  size: 349, 349
-  orig: 359, 362
-  offset: 5, 7
-  index: -1
-8
-  rotate: false
-  xy: 706, 11
-  size: 343, 346
-  orig: 351, 357
-  offset: 4, 5
-  index: -1
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

build/jsb-link/assets/resources/native/e7/e7f6e717-3b33-4873-8935-75a27a306cb3.atlas

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

build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas

@@ -1,34 +1,34 @@
-
-fudai.png
-size: 177,107
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 8
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai
-  rotate: true
-  xy: 101, 36
-  size: 69, 74
-  orig: 70, 75
-  offset: 0, 1
-  index: -1
-fudai1
-  rotate: true
-  xy: 140, 8
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+fudai.png
+size: 177,107
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 8
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai
+  rotate: true
+  xy: 101, 36
+  size: 69, 74
+  orig: 70, 75
+  offset: 0, 1
+  index: -1
+fudai1
+  rotate: true
+  xy: 140, 8
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas

@@ -1,27 +1,27 @@
-
-guanghuan.png
-size: 445,248
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-button_lq
-  rotate: false
-  xy: 248, 42
-  size: 195, 204
-  orig: 195, 204
-  offset: 0, 0
-  index: -1
-button_tv
-  rotate: false
-  xy: 248, 11
-  size: 27, 29
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-huan
-  rotate: false
-  xy: 2, 2
-  size: 244, 244
-  orig: 244, 244
-  offset: 0, 0
-  index: -1
+
+guanghuan.png
+size: 445,248
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+button_lq
+  rotate: false
+  xy: 248, 42
+  size: 195, 204
+  orig: 195, 204
+  offset: 0, 0
+  index: -1
+button_tv
+  rotate: false
+  xy: 248, 11
+  size: 27, 29
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+huan
+  rotate: false
+  xy: 2, 2
+  size: 244, 244
+  orig: 244, 244
+  offset: 0, 0
+  index: -1

build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
 RELEASE_STORE_PASSWORD=szmoka
 RELEASE_KEY_ALIAS=mokakey
 RELEASE_KEY_PASSWORD=szmoka

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2633,7 +2633,7 @@ t.prototype.checkPopCashFull = function() {
 -1 != this.FullCsahAdArr.indexOf(this.ecpmLevel.toString()) && mk.ad.showInterAd(1);
 };
 t.prototype.startPopRed = function(t) {
-if (mk.guide.isGuiding()) this.timeAd = 0; else if (gData.gameData.isTouchScreen) {
+if (mk.guide.isGuiding() || mk.ui.getCurOnPanel("redBagTask") || mk.ui.getCurOnPanel("productReward2")) this.timeAd = 0; else if (gData.gameData.isTouchScreen) {
 gData.gameData.isTouchScreen = !1;
 this.timeAd = 0;
 } else if (-1 != this.TimingRedMoneyArr.indexOf(this.ecpmLevel.toString())) {
@@ -3658,10 +3658,7 @@ this._AdaptLeftAndRight();
 };
 e.prototype._AdaptLeftAndRight = function() {
 var t = this.node.getComponent(cc.Widget);
-if (t && this.IsBigScreenRatio()) {
-t.top = 65;
-t.bottom = 65;
-}
+t && this.IsBigScreenRatio() && (t.top = 65);
 };
 e.prototype.IsBigScreenRatio = function() {
 return this.GetWinHeightWidthRatio() >= 1.86;
@@ -6356,14 +6353,9 @@ e.node_noChoose = null;
 e.lbl_times = null;
 e.lbl_value = null;
 e.isCanNotChoose = !1;
-e.data = null;
 return e;
 }
-e.prototype.setShowUI = function(t) {
-this.data = t;
-this.lbl_times.string = t.cashFrequency.toString();
-this.lbl_value.string = (t.money / 100).toString();
-};
+e.prototype.setShowUI = function() {};
 e.prototype.setIsChoose = function(t) {
 if (!this.isCanNotChoose) {
 this.node_choose.active = t;
@@ -8186,6 +8178,8 @@ return [ 2 ];
 });
 };
 e.prototype.setState = function(t) {
+return r(this, void 0, void 0, function() {
+return c(this, function() {
 this.normalProgress.fillRange = 0;
 this.normalCount.string = "";
 this.normalGroup.active = !1;
@@ -8196,6 +8190,9 @@ this.ripedIcon.active = !1;
 this.sickIcon.active = !1;
 this.ripedIcon.active = !0;
 }
+return [ 2 ];
+});
+});
 };
 e.prototype.riped = function() {
 this.counting = !1;
@@ -8689,7 +8686,12 @@ this.data = gData.gameData.getFarmDataMap(this.configID);
 this.setState(this.data.state);
 };
 e.prototype.setState = function(t) {
-if (this.state != t) {
+return r(this, void 0, void 0, function() {
+var e, o;
+return c(this, function(n) {
+switch (n.label) {
+case 0:
+if (this.state == t) return [ 3, 8 ];
 this._state = t;
 this.lockNode.active = !1;
 this.canUnlockNode.active = !1;
@@ -8698,42 +8700,73 @@ this.countDown.node.active = !1;
 this.process.node.active = !1;
 switch (this.state) {
 case s.FarmState.Lock:
-this.lockNode.active = !0;
-break;
+return [ 3, 1 ];
 
 case s.FarmState.CanUnlock:
+return [ 3, 2 ];
+
+case s.FarmState.Empty:
+return [ 3, 3 ];
+
+case s.FarmState.Growing:
+return [ 3, 4 ];
+
+case s.FarmState.Ripe:
+return [ 3, 5 ];
+
+case s.FarmState.Sick:
+return [ 3, 7 ];
+}
+return [ 3, 8 ];
+
+case 1:
+this.lockNode.active = !0;
+return [ 3, 8 ];
+
+case 2:
 this.lockNode.active = !0;
 this.canUnlockNode.active = !0;
-break;
+return [ 3, 8 ];
 
-case s.FarmState.Empty:
+case 3:
 this.idleAni && 0 == this.idleAni.active && (this.idleAni.active = !0);
-break;
+return [ 3, 8 ];
 
-case s.FarmState.Growing:
+case 4:
 this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setData(this.data);
 this.process.setData(this.data);
 this.idleAni && 1 == this.idleAni.active && (this.idleAni.active = !1);
-break;
+return [ 3, 8 ];
 
-case s.FarmState.Ripe:
+case 5:
 this.plantIcon.node.active = !0;
 this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setState(1);
 this.process.setData(this.data);
-break;
+return [ 4, mk.loader.load("game/prefab/ProductShow1", cc.Prefab) ];
 
-case s.FarmState.Sick:
+case 6:
+e = n.sent();
+(o = cc.instantiate(e)).name = "hb";
+o.parent = this.node;
+return [ 3, 8 ];
+
+case 7:
 this.plantIcon.node.active = !0;
 this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setState(0);
 this.process.setData(this.data);
+return [ 3, 8 ];
+
+case 8:
+return [ 2 ];
 }
-}
+});
+});
 };
 e.prototype.activeFram = function() {
 this.lockNode.active = !1;
@@ -8786,6 +8819,8 @@ this.data.growSpan = 0;
 gData.gameData.setFarmDataMap(this.configID, this.data);
 gData.gameData.setNextProduct(!1);
 gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node);
+var t = this.node.getChildByName("hb");
+this.node.removeChild(t);
 };
 e.prototype.plant = function(t) {
 return r(this, void 0, void 0, function() {
@@ -8821,9 +8856,14 @@ return [ 2 ];
 });
 };
 e.prototype.onRiped = function() {
+return r(this, void 0, void 0, function() {
+return c(this, function() {
 this._state = s.FarmState.Ripe;
 this.data.state = s.FarmState.Ripe;
 gData.gameData.setFarmDataMap(this.configID, this.data);
+return [ 2 ];
+});
+});
 };
 e.prototype.onSick = function() {
 this._state = s.FarmState.Sick;
@@ -10300,7 +10340,7 @@ var s = t("../../game/data/GameData"), l = cc._decorator.ccclass, p = function(t
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
-e.is_new_cb = !0;
+e.is_new_cbArr = [];
 return e;
 }
 e.prototype.onLoad = function() {
@@ -10317,6 +10357,7 @@ var r, l, p, u, d, h, f, y, g;
 return c(this, function(c) {
 switch (c.label) {
 case 0:
+this.is_new_cbArr[t] = !0;
 r = 0;
 c.label = 1;
 
@@ -10351,7 +10392,6 @@ r++;
 return [ 3, 1 ];
 
 case 5:
-this.is_new_cb = !0;
 return [ 2 ];
 }
 });
@@ -10399,8 +10439,8 @@ position: cc.v3(c)
 console.log("end_pos  ", e.position);
 -1 != a && i.showLabStrChange(a);
 if (null != n) {
-i.is_new_cb && n();
-i.is_new_cb = !1;
+i.is_new_cbArr[t] && n();
+i.is_new_cbArr[t] = !1;
 }
 mk.pool.return("game/prefab/coin", e);
 }).start();
@@ -11334,6 +11374,7 @@ this.gameData = null;
 this.init_coin = !1;
 this.updatePiggyBankValue = !1;
 this.init_head = !1;
+this.init_add = !1;
 this.init_red_point = !0;
 this.props = new Map();
 this.pools = [ {
@@ -12534,11 +12575,13 @@ e.node_taskHb = null;
 e.btn_product = null;
 e.lbl_farmLevel = null;
 e.sp_levelPer = null;
+e.ani_add = null;
 e.lastTimeSpan = 0;
 e.span = 0;
 return e;
 }
 e.prototype.onLoad = function() {
+this.ani_add.node.active = !1;
 gData.gameData.gameStyle = this;
 mk.ui.closePanel("login", function() {
 mk.ui.closePanel("agreementTip");
@@ -12762,11 +12805,12 @@ gData.gameData.init_task = !0;
 }
 };
 e.prototype.doFlyExpAni = function(t, e, o) {
-var n = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
-mk.fly.PlayCoinAnim(2, 3, e, n, function() {
+var n = this, a = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
+mk.fly.PlayCoinAnim(2, 3, e, a, function() {
 gData.gameData.gameData.gradeLevel = o.farmLevel;
 gData.gameData.gameData.farmExpValue = o.userExp;
 gData.gameData.gameData.farmGradeData = o.userFarmGrageRewardInfo;
+n.playAdd();
 });
 };
 e.prototype.registerCallBack = function() {
@@ -12776,6 +12820,10 @@ s.default.callBack = function() {
 mk.ui.openPanel("module/speedUpUI/productReward2");
 };
 };
+e.prototype.playAdd = function() {
+this.ani_add.node.active = !0;
+this.ani_add.play();
+};
 i([ d({
 type: cc.Node,
 displayName: "游戏核心玩法"
@@ -12844,6 +12892,10 @@ i([ d({
 type: cc.Sprite,
 displayName: "等级进度"
 }) ], e.prototype, "sp_levelPer", void 0);
+i([ d({
+type: cc.Animation,
+displayName: "增加效果文本"
+}) ], e.prototype, "ani_add", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = f;
@@ -14465,10 +14517,6 @@ t.prototype.setAdData.call(this, e);
 this.setToEmpty();
 };
 e.prototype.setToEmpty = function() {
-if (this.call) {
-this.call();
-this.call = null;
-}
 mk.ui.closePanel("HarvestPanel");
 };
 return i([ c ], e);
@@ -14623,9 +14671,17 @@ return null !== t && t.apply(this, arguments) || this;
 }
 e.prototype.clickNormalBtn = function() {
 return r(this, void 0, void 0, function() {
+var t;
 return c(this, function() {
 gData.harvestData.setToEmpty();
 gData.adData.checkShowFullInter(1);
+t = [ {
+rewardType: 1,
+rewardNum: 20
+} ];
+gData.reward.data = t;
+gData.reward.callback = gData.harvestData.call;
+mk.ui.openPanel("module/reward/reward");
 return [ 2 ];
 });
 });
@@ -14636,16 +14692,24 @@ var t = this;
 return c(this, function() {
 mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
-return c(this, function(t) {
-switch (t.label) {
+var t;
+return c(this, function(o) {
+switch (o.label) {
 case 0:
 mk.console.log("watchAD:" + e);
 return e ? [ 4, gData.adData.watchVideo(s.AdFun.harvest) ] : [ 3, 2 ];
 
 case 1:
-t.sent();
+o.sent();
 gData.harvestData.setToEmpty();
-t.label = 2;
+t = [ {
+rewardType: 1,
+rewardNum: 20
+} ];
+gData.reward.data = t;
+gData.reward.callback = gData.harvestData.call;
+mk.ui.openPanel("module/reward/reward");
+o.label = 2;
 
 case 2:
 return [ 2 ];
@@ -17187,6 +17251,7 @@ return e;
 e.prototype.start = function() {
 this.canvas = cc.find("Canvas");
 this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
+this.map.scale = 1.2;
 this.node.setPosition(cc.v2(72, 348));
 };
 e.prototype.onDestroy = function() {
@@ -23126,6 +23191,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.add_redbag_value = 0;
 e._data = [];
+e.callback = null;
 e.subType = 1;
 return e;
 }
@@ -23470,6 +23536,10 @@ return [ 2 ];
 e.prototype.clickGetReward = function() {
 cc.log("获取奖励：", gData.reward.data);
 gData.reward.flyCoinAnim(this.node_hb);
+if (gData.reward.callback) {
+gData.reward.callback();
+gData.reward.callback = null;
+}
 this.onClickClose();
 0 == gData.gameData.getProp(p.GameProp.videoTimes) && mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");
 };
@@ -24497,15 +24567,13 @@ e = gData.sign.adData;
 return [ 4, mk.http.sendData("readyCash", {}) ];
 
 case 2:
-if (0 != (o = a.sent()).errcode) {
-mk.tip.pop("系统异常");
-return [ 2 ];
-}
+0 != (o = a.sent()).errcode && mk.tip.pop("系统异常");
 0 == o.CashMode || o.CashMode;
 n = Math.round(100 * e.videoRedMoney.videoRewardList[0].rewardNum);
 gData.receiptNotice.receip_rmb = n;
 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
 mk.ui.openPanel("module/newNotice/newNotice", s.OpenActionType.closeLast);
+gData.cashNormal.getRecord();
 return [ 3, 4 ];
 
 case 3:
@@ -27498,7 +27566,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../component/BtnClosePanel"), l = t("../../component/SetGray"), p = t("../../data/AdData"), u = t("../../data/GameData"), d = t("./TurnableItem"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
+var s = t("../../component/BtnClosePanel"), l = t("../../data/AdData"), p = t("../../data/GameData"), u = t("./TurnableItem"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -27530,7 +27598,7 @@ this.node_turn.runAction(this.act_rotate);
 e.prototype.initData = function() {
 this.rewardWeights = [ 0, 0, 0 ];
 if (gData.turnable.config) for (var t = 0; t < gData.turnable.config.length; t++) {
-var e = this.node_items[t].getComponent(d.default), o = parseInt(gData.turnable.config[t].type);
+var e = this.node_items[t].getComponent(u.default), o = parseInt(gData.turnable.config[t].type);
 this.rewardWeights[o - 1]++;
 e.initData(o, t);
 }
@@ -27539,10 +27607,10 @@ this.updateLeftTimes();
 };
 e.prototype.clickDraw = function() {
 if (gData.turnable.leftTimes > 0) {
-mk.ad.videoAdType = u.VideoAdType.Turntable;
+mk.ad.videoAdType = p.VideoAdType.Turntable;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-t && gData.adData.watchVideo(p.AdFun.turntable);
+t && gData.adData.watchVideo(l.AdFun.turntable);
 });
 }
 };
@@ -27608,7 +27676,6 @@ return [ 2 ];
 };
 e.prototype.updateLeftTimes = function() {
 this.lbl_left.string = "剩余：<color=#FFED99>" + gData.turnable.leftTimes + "</color>次";
-this.btn_draw.setGray(!0);
 var t = 10 - gData.turnable.leftTimes;
 if (0 == t) this.lbl_probability.string = "<color=#FBE5D0>当前概率: 5%</color>"; else {
 t >= 10 && (t = 9);
@@ -27642,22 +27709,21 @@ this.playOver();
 };
 e.prototype.onDestroy = function() {};
 e.prototype.onClickClose = function() {};
-i([ y(cc.Node) ], e.prototype, "node_turn", void 0);
-i([ y(cc.Node) ], e.prototype, "node_items", void 0);
-i([ y(l.default) ], e.prototype, "btn_draw", void 0);
-i([ y(cc.Sprite) ], e.prototype, "btn_close", void 0);
-i([ y(cc.RichText) ], e.prototype, "lbl_left", void 0);
-i([ y(cc.ParticleSystem) ], e.prototype, "starAni", void 0);
-i([ y(sp.Skeleton) ], e.prototype, "baozhaAni", void 0);
-i([ y(cc.RichText) ], e.prototype, "lbl_probability", void 0);
-i([ y(cc.Node) ], e.prototype, "node_point", void 0);
-return i([ f ], e);
+i([ f(cc.Node) ], e.prototype, "node_turn", void 0);
+i([ f(cc.Node) ], e.prototype, "node_items", void 0);
+i([ f(cc.Node) ], e.prototype, "btn_draw", void 0);
+i([ f(cc.Sprite) ], e.prototype, "btn_close", void 0);
+i([ f(cc.RichText) ], e.prototype, "lbl_left", void 0);
+i([ f(cc.ParticleSystem) ], e.prototype, "starAni", void 0);
+i([ f(sp.Skeleton) ], e.prototype, "baozhaAni", void 0);
+i([ f(cc.RichText) ], e.prototype, "lbl_probability", void 0);
+i([ f(cc.Node) ], e.prototype, "node_point", void 0);
+return i([ h ], e);
 }(cc.Component);
-o.default = g;
+o.default = y;
 cc._RF.pop();
 }, {
 "../../component/BtnClosePanel": "BtnClosePanel",
-"../../component/SetGray": "SetGray",
 "../../data/AdData": "AdData",
 "../../data/GameData": "GameData",
 "./TurnableItem": "TurnableItem"
@@ -27781,13 +27847,6 @@ this.rich_text_2.node.y = -50;
 this.rich_text_2.string = this.getContent();
 }
 };
-e.prototype.setMoneyArr = function(t) {
-this.moneys = t;
-if (this.isShowFirstNotice) {
-this.rich_text_2 || console.log("sss");
-this.rich_text_2.string = this.getContent();
-}
-};
 i([ l({
 type: cc.RichText,
 displayName: "公告内容"
@@ -28854,25 +28913,6 @@ return [ 2 ];
 });
 });
 };
-e.prototype.HttpCashOut2 = function(t) {
-return i(this, void 0, void 0, function() {
-var e, o;
-return r(this, function(n) {
-switch (n.label) {
-case 0:
-e = {
-index: t
-};
-return [ 4, mk.http.sendData("redMoney/cashPay", e) ];
-
-case 1:
-if (0 != (o = n.sent()).errcode) return [ 2, null ];
-mk.console.logSingle("wallet=>", o.data);
-return [ 2 ];
-}
-});
-});
-};
 return e;
 }(t("../../../mk/data/Data").Data);
 o.WalletCashOutData = c;
@@ -28905,11 +28945,10 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = t("../../component/SetGray"), c = t("../../component/tween/TweenCast"), s = t("../../data/AdData"), l = t("../../data/GameData"), p = t("./CheckButton"), u = cc._decorator, d = u.ccclass, h = u.property, f = function(t) {
+var r = t("../../data/AdData"), c = t("../../data/GameData"), s = t("./CheckButton"), l = cc._decorator, p = l.ccclass, u = l.property, d = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
-e.tc = null;
 e.sp_progress = null;
 e.lbl_redMoney = null;
 e.lbl_value = null;
@@ -28918,16 +28957,14 @@ e.lbl_cashOut = null;
 e.lbl_noviceTitle = null;
 e.lbl_noviceValue = null;
 e.lbl_tipUp = null;
-e.btn_cashOut = null;
 e.check_button = [];
 e.curChooseIndex = 0;
 e.intV = 0;
-e.isCanCash = !1;
 return e;
 }
 e.prototype.start = function() {
 this.initNoviceUI();
-this.initCashOutUI();
+for (var t = [ {}, {}, {}, {}, {}, {} ], e = 0; e != this.check_button.length; ++e) e < t.length ? this.check_button[e].setShowUI(t[e]) : this.check_button[e].setShowUI(null);
 };
 e.prototype.initNoviceUI = function() {
 var t = gData.gameData.gameData.userNoviceWeFareInfo;
@@ -28941,29 +28978,6 @@ this.lbl_tipUp.string = "进度加满后必得" + this.intV + "元现金";
 this.lbl_cashOut.string = "满" + this.intV + "元提现";
 }
 };
-e.prototype.initCashOutUI = function() {
-if (gData.gameData.configs.CashCfg) {
-for (var t = [], e = gData.gameData.configs.CashCfg, o = 0; o != this.check_button.length; ++o) if (o < e.length) {
-this.check_button[o].setShowUI(e[o]);
-t.push(e[o].money / 100);
-} else this.check_button[o].setShowUI(null);
-this.tc.setMoneyArr(t);
-this.initTip();
-}
-};
-e.prototype.initTip = function() {
-var t = gData.gameData.configs.CashCfg[this.curChooseIndex];
-if (gData.gameData.gameData.redMoney - t.redMoney >= 0) {
-this.lbl_tip.string = "可提现";
-this.isCanCash = !0;
-this.btn_cashOut.setGray(!1);
-} else {
-var e = t.money / 100, o = (gData.gameData.gameData.redMoney / 1e4).toFixed(2) + "元";
-this.lbl_tip.string = "需要" + e + "元，当前只有" + o;
-this.isCanCash = !1;
-this.btn_cashOut.setGray(!0);
-}
-};
 e.prototype.update = function() {
 if (gData.walletCashOutData.init_novice) {
 this.initNoviceUI();
@@ -28977,19 +28991,15 @@ if (o != this.curChooseIndex && !this.check_button[o].getIsCanNotChoose()) {
 this.check_button[o].setIsChoose(!0);
 this.check_button[this.curChooseIndex].setIsChoose(!1);
 this.curChooseIndex = o;
-this.initTip();
 }
 };
 e.prototype.clickCashOutBtn = function() {
 mk.audio.playEffect("button");
-if (this.isCanCash) {
 gData.adData.checkPopCashFull();
-gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
-}
 };
 e.prototype.clickAddProgressBtn = function() {
 mk.audio.playEffect("button");
-mk.ad.videoAdType = l.VideoAdType.CashOutNoviceWelfare;
+mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.walletCashOutData.addProgress();
@@ -28997,10 +29007,10 @@ t && gData.walletCashOutData.addProgress();
 };
 e.prototype.clickAddCashBtn = function() {
 mk.audio.playEffect("button");
-mk.ad.videoAdType = l.VideoAdType.CashOutNoviceWelfare;
+mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-t && gData.adData.watchVideo(s.AdFun.cashOutAddCash);
+t && gData.adData.watchVideo(r.AdFun.cashOutAddCash);
 });
 };
 e.prototype.clickEnoughCashOutBtn = function() {
@@ -29017,54 +29027,47 @@ mk.audio.playEffect("closeButton");
 e.prototype.onDisable = function() {
 gData.adData.checkShowFullInter(4);
 };
-i([ h({
-displayName: "公告组件",
-type: c.default
-}) ], e.prototype, "tc", void 0);
-i([ h({
+i([ u({
 displayName: "进度条",
 type: cc.Sprite
 }) ], e.prototype, "sp_progress", void 0);
-i([ h({
+i([ u({
 displayName: "红包币",
 type: cc.Label
 }) ], e.prototype, "lbl_redMoney", void 0);
-i([ h({
+i([ u({
 displayName: "金额",
 type: cc.Label
 }) ], e.prototype, "lbl_value", void 0);
-i([ h({
+i([ u({
 displayName: "下提示",
 type: cc.Label
 }) ], e.prototype, "lbl_tip", void 0);
-i([ h({
+i([ u({
 displayName: "提现按钮文本",
 type: cc.Label
 }) ], e.prototype, "lbl_cashOut", void 0);
-i([ h({
+i([ u({
 displayName: "新手描述",
 type: cc.Label
 }) ], e.prototype, "lbl_noviceTitle", void 0);
-i([ h({
+i([ u({
 displayName: "新手金额",
 type: cc.Label
 }) ], e.prototype, "lbl_noviceValue", void 0);
-i([ h({
+i([ u({
 displayName: "上提示",
 type: cc.Label
 }) ], e.prototype, "lbl_tipUp", void 0);
-i([ h(r.default) ], e.prototype, "btn_cashOut", void 0);
-i([ h({
+i([ u({
 displayName: "6个选择按钮",
-type: p.default
+type: s.default
 }) ], e.prototype, "check_button", void 0);
-return i([ d ], e);
+return i([ p ], e);
 }(cc.Component);
-o.default = f;
+o.default = d;
 cc._RF.pop();
 }, {
-"../../component/SetGray": "SetGray",
-"../../component/tween/TweenCast": "TweenCast",
 "../../data/AdData": "AdData",
 "../../data/GameData": "GameData",
 "./CheckButton": "CheckButton"

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631004554498,
-    "genTime": 1631004554498,
+    "buildTime": 1631019061626,
+    "genTime": 1631019061626,
     "genVersion": null
 }