解决冲突

.gitignore

@@ -1,17 +1,16 @@
-/mk_framework/library
-/mk_framework/local
-/mk_framework/temp
-.vscode
-/mk_framework/assets/scene/TestScene.fire
-/mk_framework/assets/scene/TestScene.fire.meta
-/mk_framework/build
-/mk_framework/assets/scene/TestScene.ts
-/mk_framework/assets/scene/TestScene.ts.meta
-temp
-library
-local
-/assets/scene/TestScene.fire.meta
-/assets/scene/TestScene.ts
-/assets/scene/TestScene.ts.meta
-/assets/scene/TestScene.fire
-
+/mk_framework/library
+/mk_framework/local
+/mk_framework/temp
+.vscode
+/mk_framework/assets/scene/TestScene.fire
+/mk_framework/assets/scene/TestScene.fire.meta
+/mk_framework/build
+/mk_framework/assets/scene/TestScene.ts
+/mk_framework/assets/scene/TestScene.ts.meta
+temp
+library
+local
+/assets/scene/TestScene.fire.meta
+/assets/scene/TestScene.ts
+/assets/scene/TestScene.ts.meta
+/assets/scene/TestScene.fire

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4e4c7e27-6fce-4142-bde1-d4e0cea5b72e",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20001.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "8116a4ca-fb2c-4902-a87b-b9ba3144ea28",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20001": {
+      "ver": "1.0.4",
+      "uuid": "02bb5811-db79-4575-a0eb-3e4981932168",
+      "rawTextureUuid": "8116a4ca-fb2c-4902-a87b-b9ba3144ea28",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20002.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0a7338cb-e555-47f8-9373-71f3f77f9d96",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20002": {
+      "ver": "1.0.4",
+      "uuid": "39909b0e-8445-4d29-af0d-e2483e2141d9",
+      "rawTextureUuid": "0a7338cb-e555-47f8-9373-71f3f77f9d96",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20003.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5a09e6c9-cfd1-41b9-ba41-145685d0d9b4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20003": {
+      "ver": "1.0.4",
+      "uuid": "ea573a78-ab7c-4d4c-80a0-5b51faf4da55",
+      "rawTextureUuid": "5a09e6c9-cfd1-41b9-ba41-145685d0d9b4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20010.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 24,
+  "width": 48,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20010": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0.5,
-      "trimX": 1,
+      "offsetY": 0,
+      "trimX": 0,
       "trimY": 0,
       "width": 48,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 24,
+      "rawWidth": 48,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20011.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 25,
+  "width": 48,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20011": {
@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": -1,
-      "trimX": 3,
-      "trimY": 2,
-      "width": 46,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 48,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 25,
+      "rawWidth": 48,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20012.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 25,
+  "width": 47,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20012": {
@@ -20,12 +20,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 48,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 47,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 25,
+      "rawWidth": 47,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/script/before/main/FactoryIcon.ts

@@ -1,4 +1,4 @@
-import { FactroyState, ProductType } from "../../game/data/GameData";
+import { FactroyState, GameProp, ProductType } from "../../game/data/GameData";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
 import { IDHelper } from "./IDHelper";
@@ -25,11 +25,12 @@ export class FactoryIcon extends cc.Component {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
+
         this.tab = gData.gameData.getTabByConfigID(this.configID);
 
         this.countDown.node.active = false;
-
         this.freshState();
+        gData.factorySystem.addFactory(this);
     }
 
     update() {
@@ -118,12 +119,21 @@ export class FactoryIcon extends cc.Component {
 
     public make(id) {
         if (this.data.state == FactroyState.Empty) {
+            gData.gameData.isProducting = true;
             let config = gData.gameData.getProductMap(id);
             let growSpan = Date.now() + config.time * 1000;
             this.data.state = FactroyState.Producting;
             this.data.productID = config.picture;
             this.data.growSpan = growSpan;
             gData.gameData.setFactoryDataMap(this.configID, this.data);
+
+            gData.gameData.leftTimes--;
+            gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
+            gData.gameData.init_leftTimes = true;
+
+            gData.adData.checkPopRed();
+            
+            gData.gameData.isProducting = false;
         }
     }
 
@@ -149,5 +159,6 @@ export class FactoryIcon extends cc.Component {
         this.data.productID = 0;
         this.data.growSpan = 0;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 }

assets/script/before/main/FactorySystem.ts

@@ -8,7 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class FactorySystem {
     private _currSelectFactory: FactoryIcon = null;
-    private factoryIcons: Array<FactoryIcon> = [];
+    public factoryIcons: Array<FactoryIcon> = [];
 
     public set currSelectFactory(factory: FactoryIcon) {
         this._currSelectFactory = factory;
@@ -29,7 +29,7 @@ export default class FactorySystem {
     public nextFactory() {
         let len = this.factoryIcons.length;
         for (var i = 0; i < len; i++) {
-            if (this.factoryIcons[i].state == FactroyState.Empty) {
+            if (this.factoryIcons[i].data.state == FactroyState.Empty) {
                 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
                 gData.gameData.nextMake = this.factoryIcons[i];
                 return this.factoryIcons[i];

assets/script/before/main/FarmIcon.ts

@@ -23,7 +23,7 @@ export class FarmIcon extends cc.Component {
     private plantID: number = 0;
     private _state: FarmState = -1;
     public get state(): FarmState { return this._state; }
-    private data = null;
+    public data = null;
     onLoad() {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
@@ -143,12 +143,13 @@ export class FarmIcon extends cc.Component {
         this.data.productID = 0;
         this.data.growSpan = 0;
         gData.gameData.setFarmDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 
     public async plant(id: number) {
         if (this.state == FarmState.Empty && !gData.farmSystem.plantIsRequesting) {
             this.plantID = id;
-            gData.farmSystem.plantIsRequesting = true;
+            gData.gameData.isProducting = true;
 
             this.plantIcon.node.active = true;
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
@@ -160,7 +161,9 @@ export class FarmIcon extends cc.Component {
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;
 
-            gData.farmSystem.plantIsRequesting = false;
+            gData.adData.checkPopRed();
+            
+            gData.gameData.isProducting = false;
         }
     }
 

assets/script/before/main/FarmSystem.ts

@@ -45,7 +45,7 @@ export class FarmSystem {
     /**获取可种植农田 */
     private getCanPlantFarm(): FarmIcon | null {
         for (let i = 0; i < this.farms.length; i++) {
-            if (this.farms[i] != this.currSelectFarm && this.farms[i].state == FarmState.Empty) {
+            if (this.farms[i] != this.currSelectFarm && this.farms[i].data.state == FarmState.Empty) {
                 gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
                 gData.gameData.nextMake = this.farms[i];
                 return this.farms[i];

assets/script/before/main/PastureIcon.ts

@@ -1,6 +1,6 @@
 /** 养殖类 */
 
-import { AnimalState, PastureState, ProductType } from "../../game/data/GameData";
+import { AnimalState, GameProp, PastureState, ProductType } from "../../game/data/GameData";
 import Animals from "../view/Animals";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
@@ -16,7 +16,7 @@ export default class PastureIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: cc.Node, tooltip: "完成品展示节点" }) showGroup: cc.Node = null;
 
-    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+    @property({ type: cc.Node, tooltip: '闲置动画' }) idleAni: cc.Node = null;
 
     private animalsArr: Array<Animals> = new Array<Animals>();
 
@@ -35,6 +35,9 @@ export default class PastureIcon extends cc.Component {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
+        this.data = gData.gameData.getPastureDataMap(this.configID);
+
+        gData.pastureSystem.addPastureIcon(this);
         this.points.parent.active = false;
         let index = 0;
         let point = null;
@@ -56,7 +59,6 @@ export default class PastureIcon extends cc.Component {
         }
 
         this.freshState();
-        
     }
 
     update() {
@@ -89,8 +91,7 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Hanger, this.configID);
                     }
-                    if(this.idleAni && this.idleAni.active == false)
-                    {
+                    if (this.idleAni && this.idleAni.active == false) {
                         this.idleAni.active = true;
                     }
                     break;
@@ -102,8 +103,7 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Eat, this.configID);
                     }
-                    if(this.idleAni && this.idleAni.active == true)
-                    {
+                    if (this.idleAni && this.idleAni.active == true) {
                         this.idleAni.active = false;
                     }
                     break;
@@ -180,13 +180,22 @@ export default class PastureIcon extends cc.Component {
     }
 
     onEat() {
-        let config = gData.gameData.getProductMap(this.data.productID);
-        let growSpan = Date.now() + config.time * 1000;
-        this.data.state = PastureState.Growing;
-        this.data.productID = this.data.productID;
-        this.data.growSpan = growSpan;
-        gData.gameData.setPastureDataMap(this.configID, this.data);
-        this.eatNode.active = false;
+        if (this.state == PastureState.Empty) {
+            gData.gameData.isProducting = true;
+            let config = gData.gameData.getProductMap(this.data.productID);
+            let growSpan = Date.now() + config.time * 1000;
+            this.data.state = PastureState.Growing;
+            this.data.productID = this.data.productID;
+            this.data.growSpan = growSpan;
+            gData.gameData.setPastureDataMap(this.configID, this.data);
+            this.eatNode.active = false;
+
+            gData.gameData.leftTimes--;
+            gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
+            gData.gameData.init_leftTimes = true;
+
+            gData.gameData.isProducting = false;
+        }
     }
 
     onRipe() {
@@ -209,5 +218,6 @@ export default class PastureIcon extends cc.Component {
         this.data.state = PastureState.Empty;
         this.data.growSpan = 0;
         gData.gameData.setPastureDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 }

assets/script/before/main/PastureSystem.ts

@@ -8,7 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class PastureSystem {
     private pastureDataMap: Map<number, PastureData> = new Map<number, PastureData>();
-    private pastureIcons: Array<PastureIcon> = [];
+    public pastureIcons: Array<PastureIcon> = [];
 
     setPastureData(configID) {
         if (this.getPastureData(configID)) {
@@ -31,8 +31,8 @@ export default class PastureSystem {
     nextPasture() {
         let len = this.pastureIcons.length;
         for (var i = 0; i < len; i++) {
-            if (this.pastureIcons[i].state == PastureState.Empty) {
-                gData.gameData.nextCanProduct = this.pastureIcons[i].data;
+            if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
                 gData.gameData.nextMake = this.pastureIcons[i];
                 return this.pastureIcons[i];
             }

assets/script/before/map/MapMove.ts

@@ -16,11 +16,6 @@ export class MapMove extends cc.Component {
     start() {
         this.canvas = cc.find('Canvas');
         this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
-
-        //地图场景加载结束
-        this.scheduleOnce(() => {
-            gData.gameData.setNextProduct();
-        }, 0.1)
     }
 
     onDestroy() {

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

@@ -25,6 +25,7 @@ export default class ADUnlockData extends Data {
         }
         else {
             gData.gameData.setFarmDataMap(this.curConfigID, farm);
+            gData.gameData.setNextProduct();
         }
     }
 }

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

@@ -12,6 +12,8 @@ export default class HarvestPanel extends cc.Component {
         // gData.harvestData.config.picture
         //调用收获红包币接口
         gData.harvestData.setToEmpty();
+
+        gData.adData.checkShowFullInter(1);
     }
 
     public async clickSuperBtn() {

assets/script/game/data/AdData.ts

@@ -1,3 +1,4 @@
+import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
 import { GameProp } from "./GameData";
 
@@ -183,56 +184,111 @@ export class AdData {
         mk.http.sendData('updateADLog', sData);
     }
 
-    /** 设置关闭红包弹出全屏插屏序列 */
-    setFullInterShowStr() {
-        let fullInterShowStrArr = [];
-        if (gData.gameData.configs.GlobalCfg.fullInterShowStrArr) {
-            fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(';');
+    /** 检查是否显示全屏插屏
+     * @type  1:只对 ecpmLevel == 1 生效;  2:对所有玩家生效  3:延时弹出  4:先弹出插屏，再弹出全屏插屏
+     */
+    checkShowFullInter(type) {
+        let per = this.getPerByEcpm();
+        let pop = Math.random() < per;
+        if (!pop) {
+            return;
         }
-
-        for (var i = 0; i < fullInterShowStrArr.length; i++) {
-            let tempArr = fullInterShowStrArr[i].split(',');
-            if (gData.gameData.adShowConfig.average_ecpm <= tempArr[1]) {
-                this.fullInterShowStr = tempArr[2];
+        switch (type) {
+            case 1:
+                if (gData.gameData.ecpmLevel == 1) {
+                    mk.ad.showInterAd(1);
+                }
+                break;
+            case 2:
+                mk.ad.showInterAd(1);
+                break;
+            case 3:
+                let delayArr = gData.gameData.configs.ServerConfig.AdDelay.split(',');
+                let min = parseFloat(delayArr[0]);
+                let max = parseFloat(delayArr[1]);
+                let delay = (min + (max - min) * Math.random()) * 1000;
+                setTimeout(() => {
+                    mk.ad.showInterAd(1);
+                }, delay);
+                break;
+            case 4:
+                let delayArr1 = gData.gameData.configs.ServerConfig.AdDelay.split(',');
+                let min1 = parseFloat(delayArr1[0]);
+                let max1 = parseFloat(delayArr1[1]);
+                let delay1 = (min1 + (max1 - min1) * Math.random()) * 1000;
+                let delay2 = (min1 + (max1 - min1) * Math.random()) * 1000;
+                setTimeout(() => {
+                    mk.ad.showInterAd(0);
+                    setTimeout(() => {
+                        mk.ad.showInterAd(1);
+                    }, delay2);
+                }, delay1);
                 break;
-            }
         }
     }
 
-    /** 检查是否显示全屏插屏
-     * @type 不同情况弹出类型 1：提现结束判断ecpm低于一定值弹出  2：关闭红包界面不观看激励视频有概率拉起全屏广告
-     */
-    checkShowFullInter(type) {
-        //全屏广告开关
-        if (gData.gameData.configs.GlobalCfg.popFullInter != "1") {
-            return
+    //定时弹出计时
+    private timeAd = 0;
+    /** 定时弹出红包 */
+    startPopRed(dt) {
+        this.timeAd += dt;
+        switch (gData.gameData.ecpmLevel) {
+            case 1:
+                if (this.timeAd >= 30 * 1000) {
+                    this.timeAd = 0;
+                    mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+                }
+                break;
+            case 2:
+                if (this.timeAd >= 60 * 1000) {
+                    this.timeAd = 0;
+                    mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+                }
+                break;
+            case 3:
+                this.timeAd = 0;
+                break;
         }
+    }
 
-        if (type == 1) {
-            if (gData.gameData.adShowConfig.average_ecpm <= gData.gameData.configs.GlobalCfg.popFullEcpmAfterCash) {
-                mk.ad.showInterAd(1);
+    /** 需要弹出红包的点击数 */
+    popClickTimes = 0;
+    /** 累计点击数 */
+    clickTimesAdd = 0;
+
+    setPopClickTimes() {
+        let arr = gData.gameData.configs.ServerConfig.ClickProduction.split(',');
+        this.popClickTimes = Util.rnd(parseInt(arr[0]), parseInt(arr[1]));
+    }
+
+    checkPopRed() {
+        this.clickTimesAdd++;
+        if (this.clickTimesAdd >= this.popClickTimes) {
+            this.clickTimesAdd = 0;
+            this.setPopClickTimes();
+            if (Math.random() <= this.getPerByEcpm()) {
+                mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             }
         }
-        else if (type == 2) {
-            if (this.fullInterShowStr) {
-                let popFullIndex = mk.storage.getStorage('popFullIndex');
-                if (popFullIndex == null) {
-                    popFullIndex = 0;
-                }
-                else {
-                    popFullIndex++;
-                }
-                mk.storage.setStorage('popFullIndex', popFullIndex);
+    }
 
-                let index = popFullIndex % this.fullInterShowStr.length;
-                mk.console.log('checkShowFullInter  this.fullInterShowStr  ', this.fullInterShowStr);
-                mk.console.log('checkShowFullInter  index', index);
-                if (this.fullInterShowStr[index] == '1') {
-                    mk.console.log('checkShowFullInter showInterAd');
-                    mk.ad.showInterAd(1);
-                }
+
+
+    getPerByEcpm() {
+        //test
+        return 1;
+
+        let forceAd = gData.gameData.configs.forceAd;
+        let len = forceAd.length;
+        let per = 0;
+        for (var i = 0; i < len; i++) {
+            if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
+                per = parseFloat(forceAd[i].percent);
+                break;
             }
         }
+
+        return per;
     }
 }
 

assets/script/game/data/GameData.ts

@@ -62,9 +62,15 @@ export class GameData {
     public nextMake = null;
     /** 类型标识 */
     private nextType = 0;
-
+    /** 刷新生产按钮信息 */
     public init_makeInfo = false;
 
+    /** 正在生产 */
+    public isProducting = false;
+
+    /** 用户价值等级 1 低 2 中 3 高*/
+    public ecpmLevel = 0;
+
     /** 标志位 刷新任务描述 */
     public init_task = false;
     /**
@@ -104,6 +110,8 @@ export class GameData {
         }
         this.adShowConfig = response.data;
         mk.console.logSingle("user/adShowConfig", response.data);
+        this.setEcpmLevel();
+        gData.adData.setPopClickTimes();
 
         data = {};
         response = await mk.http.sendData('welFare/getUserWelFareTaskInfo', data);
@@ -118,8 +126,6 @@ export class GameData {
             element.init();
         });
 
-        gData.adData.setFullInterShowStr();
-
         this.dataFinish = true;
     }
 
@@ -239,77 +245,65 @@ export class GameData {
         this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
         this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
         //test
+        this.leftTimes = 100;
+        this.maxTimes = 100;
         this.ProductionRecovery = 1;
     }
 
     //图鉴领取数据
     private _farmMapRewardData = [];
 
-    public getFarmMapRewardState(index)
-    {
-        
-        if(index.i < this._farmMapRewardData.length)
-        {
-            if(index.j < this._farmMapRewardData[index.i].length)
-            {
+    public getFarmMapRewardState(index) {
+
+        if (index.i < this._farmMapRewardData.length) {
+            if (index.j < this._farmMapRewardData[index.i].length) {
                 return this._farmMapRewardData[index.i][index.j];
             }
         }
         return 1;
     }
 
-    public setFarmMapRewardState(index, state)
-    {
-        if(index.i < this._farmMapRewardData.length)
-        {
-            if(index.j < this._farmMapRewardData[index.i].length)
-            {
+    public setFarmMapRewardState(index, state) {
+        if (index.i < this._farmMapRewardData.length) {
+            if (index.j < this._farmMapRewardData[index.i].length) {
                 this._farmMapRewardData[index.i][index.j] = state;
                 this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
             }
         }
     }
-    
-    private initFarmMapGetRewardData()
-    {
+
+    private initFarmMapGetRewardData() {
         this._farmMapRewardData = this.getProp(GameProp.farmMapGetRewardData);
-        if(!this._farmMapRewardData)
-        {
+        if (!this._farmMapRewardData) {
             this._farmMapRewardData = [];
         }
         let needSync = false;
         let index = 0;
-        this._productTypeMap.forEach((value, key)=>{
+        this._productTypeMap.forEach((value, key) => {
 
-            if(this._farmMapRewardData.length <= index)
-            {
+            if (this._farmMapRewardData.length <= index) {
                 let len = value.length;
                 let arr = [];
-                for(let i = 0; i != len; ++i)
-                {
+                for (let i = 0; i != len; ++i) {
                     arr.push(0);
                 }
                 this._farmMapRewardData.push(arr);
                 needSync = true;
                 console.log("-----add 数组数据")
-            }else
-            {
+            } else {
                 let data = this._farmMapRewardData[index];
                 let len = value.length;
-                for(let i = 0; i != len; ++i)
-                {
-                    if(i >= data.length)
-                    {
+                for (let i = 0; i != len; ++i) {
+                    if (i >= data.length) {
                         data.push(0);
                         needSync = true;
                         console.log("-----add 单个数据")
                     }
                 }
-            }       
+            }
             ++index;
         });
-        if(needSync)
-        {
+        if (needSync) {
             this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
         }
     }
@@ -354,9 +348,9 @@ export class GameData {
         let canArr = [];
         let len = arr.length;
         for (var i = 0; i < len; i++) {
-            if (arr[i] <= max) {
-                canArr.push(arr[i]);
-                if (arr[i] == max) {
+            if (arr[i].picture <= max) {
+                canArr.push(arr[i].picture);
+                if (arr[i].picture == max) {
                     break;
                 }
             }
@@ -367,6 +361,7 @@ export class GameData {
         return this.getProductMap(id);
     }
 
+    /** 自动生产选中下一个 */
     setNextProduct() {
         this.nextMake = null;
         let next = gData.farmSystem.selectNextFarm();
@@ -392,6 +387,14 @@ export class GameData {
         this.init_makeInfo = true;
     }
 
+    hasFirstCheck = false;
+    firstCheckNext() {
+        if (!this.hasFirstCheck && gData.pastureSystem.pastureIcons.length >= 3 && gData.factorySystem.factoryIcons.length >= 6) {
+            this.hasFirstCheck = true;
+            gData.gameData.setNextProduct();
+        }
+    }
+
     makeProduct() {
         switch (this.nextType) {
             case 0:
@@ -404,6 +407,7 @@ export class GameData {
             case 2:
                 gData.pastureSystem.btnMake();
                 this.setNextProduct();
+                gData.adData.checkPopRed();
                 break;
             case 3:
                 gData.factorySystem.btnMake();
@@ -676,12 +680,16 @@ export class GameData {
                 }
                 else {
                     data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
+                    //更新最大可购买商品
+                    this.setMaxProduct(tab, arr[0].picture, false);
                 }
                 this._factoryData.push(data);
                 this._factoryDataMap.set(id, data);
                 id++;
             }
+
             //更新到服务器
+            this.setProp(GameProp.maxProduct, this._maxProduct);
             this.setProp(GameProp.factoryData, this._factoryData);
         }
         else {
@@ -762,7 +770,7 @@ export class GameData {
         return null;
     }
 
-    public setMaxProduct(tab, id) {
+    public setMaxProduct(tab, id, sendToServer = true) {
         if (!this._maxProduct) {
             this._maxProduct = [];
         }
@@ -783,7 +791,9 @@ export class GameData {
             this._maxProduct.push(data);
         }
 
-        this.setProp(GameProp.maxProduct, this._maxProduct);
+        if (sendToServer) {
+            this.setProp(GameProp.maxProduct, this._maxProduct);
+        }
     }
 
     public initSetMaxProduct() {
@@ -809,7 +819,7 @@ export class GameData {
                     needUpdate = false;
                     for (var i = 0; i < len; i++) {
                         data = this.getPastureDataMap(id);
-                        if (data.state == PastureState.Lock && configArr[i].value >= this.gameData.gradeLevel) {
+                        if (data.state == PastureState.Lock && configArr[i].value <= this.gameData.gradeLevel) {
                             data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
                             this.setPastureDataMap(id, data, false);
                             needUpdate = true;
@@ -819,6 +829,7 @@ export class GameData {
                     //更新到服务器
                     if (needUpdate) {
                         this.setProp(GameProp.pastureData, this._pastureData);
+                        this.setNextProduct();
                     }
                     break;
                 default:
@@ -826,7 +837,7 @@ export class GameData {
                     needUpdate = false;
                     let configID = this.getConfigIDByTab(tab);
                     data = this.getFactoryDataMap(configID);
-                    if (data.state == FactroyState.Lock && gData.gameData.gameData.gradeLevel >= configArr[0].value) {
+                    if (data.state == FactroyState.Lock && configArr[0].value <= this.gameData.gradeLevel) {
                         data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
                         this.setFactoryDataMap(configID, data, false);
                         needUpdate = true;
@@ -836,11 +847,28 @@ export class GameData {
 
                     if (needUpdate) {
                         this.setProp(GameProp.factoryData, this._factoryData);
+                        this.setNextProduct();
                     }
                     break;
             }
         }
     }
+
+    /** 设置用户ecpm分级 */
+    private setEcpmLevel() {
+        let low = parseInt(gData.gameData.configs.ServerConfig.LowValueEcpm.split(',')[1]);
+        let medium = parseInt(gData.gameData.configs.ServerConfig.MediumValueEcpm.split(',')[1]);
+        let high = parseInt(gData.gameData.configs.ServerConfig.HighValueEcpm.split(',')[1]);
+        if (this.adShowConfig.average_ecpm <= low) {
+            this.ecpmLevel = 1;
+        }
+        else if (this.adShowConfig.average_ecpm <= medium) {
+            this.ecpmLevel = 2;
+        }
+        else {
+            this.ecpmLevel = 3;
+        }
+    }
 }
 
 /**
@@ -880,7 +908,7 @@ export enum GameProp {
 
     /**
      图鉴领取数据*/
-     farmMapGetRewardData = 17,
+    farmMapGetRewardData = 17,
 
 
 

assets/script/game/game/Game.ts

@@ -1,5 +1,5 @@
 import JsbSystem from "../../mk/system/JsbSystem";
-import { DataEventId, FarmState, GameProp, VideoAdType } from "../data/GameData";
+import { DataEventId, FarmState, GameProp, ProductType, VideoAdType } from "../data/GameData";
 import FunBtns from "./FunBtns";
 
 const { ccclass, property } = cc._decorator;
@@ -115,7 +115,7 @@ export default class Game extends cc.Component {
         mainNode.addChild(cc.instantiate(coreGame));
     }
 
-    update() {
+    update(dt) {
         if (gData.gameData.init_coin) {
             this.changeInfo();
         }
@@ -141,6 +141,10 @@ export default class Game extends cc.Component {
             this.changeTaskUI();
         }
 
+        gData.adData.startPopRed(dt);
+
+        gData.gameData.firstCheckNext();
+
         if (gData.gameData.leftTimes < gData.gameData.maxTimes && this.lastTimeSpan != 0) {
             let pass = Date.now() - this.lastTimeSpan;
             if (pass >= this.span) {
@@ -234,10 +238,24 @@ export default class Game extends cc.Component {
     }
 
     private async initCanPlantInfo() {
+        gData.gameData.init_makeInfo = false;
         if (gData.gameData.nextCanProduct) {
-            gData.gameData.init_makeInfo = false;
-            this.icon_plant.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
-            this.icon_plantName.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+            let iconPath = '';
+            let namePath = '';
+            if (gData.gameData.nextCanProduct.tab == ProductType.nzw) {
+                iconPath = "game/coregame/texture/plant_icons/plantIcon_";
+                namePath = "game/coregame/texture/plant_icons/nameIcon/plant_name_";
+            }
+            else if (gData.gameData.nextCanProduct.tab == ProductType.dw) {
+                iconPath = 'game/coregame/texture/factory_icons/factory_';
+                namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+            }
+            else {
+                iconPath = 'game/coregame/texture/factory_icons/factory_';
+                namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+            }
+            this.icon_plant.spriteFrame = await mk.loader.load(iconPath + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+            this.icon_plantName.spriteFrame = await mk.loader.load(namePath + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
         }
     }
 
@@ -344,6 +362,11 @@ export default class Game extends cc.Component {
             return;
         }
 
+        if (gData.gameData.isProducting) {
+            mk.tip.pop('点击太快了');
+            return;
+        }
+
         gData.gameData.makeProduct();
 
 

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -4,28 +4,27 @@ import { VideoAdType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
-export default class NewOpenRedBag extends cc.Component{
+export default class NewOpenRedBag extends cc.Component {
 
 
-    @property({displayName: '数字组', type: cc.Label})
+    @property({ displayName: '数字组', type: cc.Label })
     private lbl_value: cc.Label[] = [];
 
     @property(cc.Label)
     private lbl_reward_value: cc.Label = null;
     @property(cc.Sprite)
-    private spr_cash_out:  cc.Sprite = null;
+    private spr_cash_out: cc.Sprite = null;
     @property(cc.Label)
     private lbl_progress: cc.Label = null;
     @property(cc.Animation)
     private node_cash: cc.Animation = null;
 
-    start(){
+    start() {
         this.showChangePart();
 
     }
 
-    update(dt)
-    {
+    update(dt) {
         if (gData.reward.adData) {
             this.showWatchAdReward();
             gData.turnable.adData = null;
@@ -35,7 +34,7 @@ export default class NewOpenRedBag extends cc.Component{
     /**
      * 底部提现相关样式
      */
-     private initCashOutStyle(redMoney: number = 0) {
+    private initCashOutStyle(redMoney: number = 0) {
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
@@ -52,20 +51,15 @@ export default class NewOpenRedBag extends cc.Component{
         }
     }
 
-    private showWatchAdReward()
-    {
-        if(gData.reward.adData)
-        {
-            let v= '0.30';
-            v.replace('.','');
+    private showWatchAdReward() {
+        if (gData.reward.adData) {
+            let v = '0.30';
+            v.replace('.', '');
             let c = v.split('');
-            for(let i = 0; i != this.lbl_value.length; ++i)
-            {
-                if(i < c.length)
-                {
+            for (let i = 0; i != this.lbl_value.length; ++i) {
+                if (i < c.length) {
                     this.lbl_value[i].string = c[i];
-                }else
-                {
+                } else {
                     this.lbl_value[i].string = '0';
                 }
             }
@@ -83,7 +77,7 @@ export default class NewOpenRedBag extends cc.Component{
         }, 0.1)
     }
 
-    private clickOpenBtn(){
+    private clickOpenBtn() {
         mk.audio.playEffect("button");
         mk.ui.closePanel(this.name);
         mk.ad.videoAdType = VideoAdType.StartQiPaoRedBag;
@@ -96,8 +90,8 @@ export default class NewOpenRedBag extends cc.Component{
 
     }
 
-    private clickCloseBtn(){
-
-        mk.audio.playEffect("closeButton");
+    private clickCloseBtn() {
+        // mk.audio.playEffect("closeButton");
+        gData.adData.checkShowFullInter(1);
     }
 }

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -17,14 +17,14 @@ export class ATRewardVideo extends zgSingleton {
     /** 是否加载完显示 */
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
-    public ifWatchEnd: boolean = false;
+    public canGet: boolean = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
         this.ATRewardVideoJS.proxy = this;
         this.ATRewardVideoJS.init();
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
         if (this.reawardAdState == RewardAdState.Unload) {
             this.loadAd();
         }
@@ -123,7 +123,6 @@ export class ATRewardVideo extends zgSingleton {
      */
     onRewardedVideoAdPlayEnd(placementId, callbackInfo) {
         //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
     }
 
     /**
@@ -150,7 +149,7 @@ export class ATRewardVideo extends zgSingleton {
 
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
 
-        if (this.ifWatchEnd) {
+        if (this.canGet) {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.WatchEnd);
             mk.data.sendDataEvent(DataEventId.video_end, mk.ad.videoAdType);
         }
@@ -158,7 +157,7 @@ export class ATRewardVideo extends zgSingleton {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.Cancel);
         }
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
 
         this.loadAd();
     }
@@ -180,7 +179,7 @@ export class ATRewardVideo extends zgSingleton {
      */
     onReward(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
+        this.canGet = true;
     }
 }
 

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/5f/5f9365df-42be-4d06-85fd-974f13c91c3d.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],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/9e/9e3987bc-14ea-471f-aae7-b2d470bf632f.json

@@ -0,0 +1 @@
+[1,["5fk2XfQr5NBoX9l08TyRw9"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"农场图鉴","rect":[0,0,165,49],"offset":[0,0],"originalSize":[165,49],"capInsets":[0,0,0,0]}],[0],0,[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