动画修改

assets/resources/animation/moveUpAndDown.anim

@@ -0,0 +1,29 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "moveUpAndDown",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 2,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "y": [
+        {
+          "frame": 0,
+          "value": 82.728
+        },
+        {
+          "frame": 1,
+          "value": 92.728
+        },
+        {
+          "frame": 2,
+          "value": 82.728
+        }
+      ]
+    }
+  },
+  "events": []
+}

assets/resources/animation/moveUpAndDown.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "9412ab46-1c7d-45b9-8bac-04d06e0e6cf0",
+  "subMetas": {}
+}

assets/resources/game/coregame/test.prefab.meta → assets/resources/game/coregame/动物动画节点.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "de8f7edf-2f63-4df3-8709-39992376cff6",
+  "uuid": "c8646f10-2fb8-40ab-8b25-91625c5ea468",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/game/prefab/game.prefab

@@ -6224,7 +6224,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "batkdS0FRKpoLewgpqKWXg",
+    "fileId": "73szW+hhBG64TFFG0nUfwg",
     "sync": false
   },
   {
@@ -6457,7 +6457,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "7boZ0Q8ChCoJC/a6F540me",
+    "fileId": "e5B9hoDZlHPJdKB+adwHbl",
     "sync": false
   },
   {
@@ -6587,7 +6587,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "5750y3QS5IorCVlmMaSr5a",
+    "fileId": "f9CiOtBHpG4pv7GOv1c8I6",
     "sync": false
   },
   {

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

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 81,
-  "height": 102,
+  "width": 47,
+  "height": 51,
   "platformSettings": {},
   "subMetas": {
     "1": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 81,
-      "height": 102,
-      "rawWidth": 81,
-      "rawHeight": 102,
+      "width": 47,
+      "height": 51,
+      "rawWidth": 47,
+      "rawHeight": 51,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

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

@@ -15,11 +15,14 @@ export default class MoveUpAndDown extends cc.Component {
 
         this.node.getPosition(this.startPos);
 
-        let pos = cc.Vec3.ZERO;
-        this.startPos.add(this.moveOffset, pos);
+        // let pos = cc.Vec3.ZERO;
+        // this.startPos.add(this.moveOffset, pos);
+    
+        cc.tween(this.node).delay(0.2).call(()=>{
 
-        cc.tween(this.node).to(this.duration, { position: pos }).to(this.duration, { position: cc.v3(this.startPos) }, cc.easeSineOut())
-            .union().repeatForever().start();
+            this.node.position = this.startPos;
+
+        }).by(this.duration, { y: this.moveOffset.y }).by(this.duration, { y: -this.moveOffset.y }, cc.easeSineOut()).union().repeatForever().start();
 
     }
 }

assets/script/game/game/AniControl.ts

@@ -47,7 +47,7 @@ export default class AniControl extends cc.Component {
 
     start(){     
         this.doFlyBirdLogic();
-        this.doStarLogic();
+        //this.doStarLogic();
         this.doDogMoveLogic();
         //this.doDuckMoveLogic(); 
         this.doSheepMoveLogic();
@@ -69,20 +69,22 @@ export default class AniControl extends cc.Component {
         this.flyBird_2.on('finished', this.flyBirdFinished_2, this)
     }
 
-    private flyBirdFinished_1(event)
+    private flyBirdFinished_1()
     {
         let time = mk.math.random(5, 15);
         this.flyBird_1.node.active = false;
+        cc.Tween.stopAllByTarget(this.flyBird_1.node);
         cc.tween(this.flyBird_1.node).delay(time).call(()=>{
             this.flyBird_1.node.active = true;
             this.flyBird_1.play();
         }).start();
     }
 
-    private flyBirdFinished_2(event)
+    private flyBirdFinished_2()
     {
         let time = mk.math.random(5, 15);
         this.flyBird_2.node.active = false;
+        cc.Tween.stopAllByTarget(this.flyBird_2.node);
         cc.tween(this.flyBird_2.node).delay(time).call(()=>{
             this.flyBird_2.node.active = true;
             this.flyBird_2.play();
@@ -106,10 +108,13 @@ export default class AniControl extends cc.Component {
         this.dogMove.on('finished', this.moveDogFinished, this);
     }
 
-    private moveDogFinished(event)
+    private moveDogFinished()
     {
         let time = mk.math.random(5, 8);
+        this.dogMove.node.active = false;
+        cc.Tween.stopAllByTarget(this.dogMove.node);
         cc.tween(this.dogMove.node).delay(time).call(()=>{
+            this.dogMove.node.active = true;
             this.dogMove.play();
         }).start();
     }
@@ -157,8 +162,9 @@ export default class AniControl extends cc.Component {
     {
         if(this.sheepMoveEnd)
         {
+            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             this.sheepMoveEnd = false;
-            this.hb_btn.active = true;
+            this.hb_btn.active = false;
             this.moveSheep.node.active = false;
             let time = mk.math.random(5, 8);
             cc.tween(this.moveSheep.node).delay(time).call(()=>{
@@ -169,102 +175,94 @@ export default class AniControl extends cc.Component {
         }
     }
 
-    update(dt)
-    {       
-        if(this.time_1 <= 0)
-        {
-            if(!this.isShow_1)
-            {
-                this.isShow_1 = true;
-                this.time_1 = 8;
-                this.star_1.stop();
-                cc.tween(this.star_1.node).to(0.2, {opacity: 0}).start();
-            }else{
-                this.isShow_1 = false;
-                this.time_1 = 8;
-                this.star_1.play();
-                let p = mk.math.random(5, 40);
-                this.star_1.node.setPosition(this.starPos_1.subtract(cc.v2(p, p)));
-                cc.tween(this.star_1.node).to(0.2, {opacity: 255}).start();
-            }
+    // update(dt)
+    // {       
+    //     if(this.time_1 <= 0)
+    //     {
+    //         if(!this.isShow_1)
+    //         {
+    //             this.isShow_1 = true;
+    //             this.time_1 = 8;
+    //             this.star_1.stop();
+    //             cc.tween(this.star_1.node).to(0.2, {opacity: 0}).start();
+    //         }else{
+    //             this.isShow_1 = false;
+    //             this.time_1 = 8;
+    //             this.star_1.play();
+    //             let p = mk.math.random(5, 40);
+    //             this.star_1.node.setPosition(this.starPos_1.subtract(cc.v2(p, p)));
+    //             cc.tween(this.star_1.node).to(0.2, {opacity: 255}).start();
+    //         }
             
-        }else{
-            this.time_1 =  this.time_1-dt;
-        }
-
-        if(this.time_2 <= 0)
-        {
-            if(!this.isShow_2)
-            {
-                this.isShow_2 = true;
-                this.time_2 = 16;
-                this.star_2.stop();
-                cc.tween(this.star_2.node).to(0.2, {opacity: 0}).start();
-            }else{
-                this.isShow_2 = false;
-                this.time_2 = 16;
-                this.star_2.play();
-                let p = mk.math.random(5, 40);
-                this.star_2.node.setPosition(this.starPos_2.subtract(cc.v2(p, p)));
-                cc.tween(this.star_2.node).to(0.2, {opacity: 255}).start();
-            }
+    //     }else{
+    //         this.time_1 =  this.time_1-dt;
+    //     }
+
+    //     if(this.time_2 <= 0)
+    //     {
+    //         if(!this.isShow_2)
+    //         {
+    //             this.isShow_2 = true;
+    //             this.time_2 = 16;
+    //             this.star_2.stop();
+    //             cc.tween(this.star_2.node).to(0.2, {opacity: 0}).start();
+    //         }else{
+    //             this.isShow_2 = false;
+    //             this.time_2 = 16;
+    //             this.star_2.play();
+    //             let p = mk.math.random(5, 40);
+    //             this.star_2.node.setPosition(this.starPos_2.subtract(cc.v2(p, p)));
+    //             cc.tween(this.star_2.node).to(0.2, {opacity: 255}).start();
+    //         }
             
-        }else{
-            this.time_2 =  this.time_2-dt;
-        }
-
-        if(this.time_3 <= 0)
-        {
-            if(!this.isShow_3)
-            {
-                this.isShow_3 = true;
-                this.time_3 = 22;
-                this.star_3.stop();
-                cc.tween(this.star_3.node).to(0.2, {opacity: 0}).start();
-            }else{
-                this.isShow_3 = false;
-                this.time_3 = 22;
-                this.star_3.play();
-                let p = mk.math.random(5, 40);
-                this.star_3.node.setPosition(this.starPos_3.subtract(cc.v2(p, p)));
-                cc.tween(this.star_3.node).to(0.2, {opacity: 255}).start();
-            }
+    //     }else{
+    //         this.time_2 =  this.time_2-dt;
+    //     }
+
+    //     if(this.time_3 <= 0)
+    //     {
+    //         if(!this.isShow_3)
+    //         {
+    //             this.isShow_3 = true;
+    //             this.time_3 = 22;
+    //             this.star_3.stop();
+    //             cc.tween(this.star_3.node).to(0.2, {opacity: 0}).start();
+    //         }else{
+    //             this.isShow_3 = false;
+    //             this.time_3 = 22;
+    //             this.star_3.play();
+    //             let p = mk.math.random(5, 40);
+    //             this.star_3.node.setPosition(this.starPos_3.subtract(cc.v2(p, p)));
+    //             cc.tween(this.star_3.node).to(0.2, {opacity: 255}).start();
+    //         }
             
-        }else{
-            this.time_3 =  this.time_3-dt;
-        }
-    }
+    //     }else{
+    //         this.time_3 =  this.time_3-dt;
+    //     }
+    // }
 
     private clickAnimalIconBtn(event, customEvenData)
     {
         mk.audio.playEffect("button");
         if(customEvenData == 'bird_1')
         {
+            this.flyBirdFinished_1();
             mk.fly.PlayCoinAnim(1, 5, this.flyBird_1.node, '', ()=>{
 
                 console.log('--');
-            });
+            }, 2);
         }else if(customEvenData == 'bird_2')
         {
-            mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node);
-        }else if(customEvenData == 'star_1')
-        {
-            mk.fly.PlayCoinAnim(1, 5, this.star_1.node);
-        }else if(customEvenData == 'star_2')
-        {
-            mk.fly.PlayCoinAnim(1, 5, this.star_2.node);
-        }else if(customEvenData == 'star_3')
-        {
-            mk.fly.PlayCoinAnim(1, 5, this.star_3.node);
+            this.flyBirdFinished_2();
+            mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, '', null,2);
         }else if(customEvenData == 'dog')
         {
-            mk.fly.PlayCoinAnim(1, 5, this.dogMove.node);
-        }else if(customEvenData == 'duck')
-        {
-            mk.fly.PlayCoinAnim(1, 5, this.moveDuck.node);
+            this.moveDogFinished();
+            mk.fly.PlayCoinAnim(1, 5, this.dogMove.node,'', null,2);
         }else if(customEvenData == 'sheep')
         {
-            mk.fly.PlayCoinAnim(1, 5, this.moveSheep.node);
+            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+            //mk.fly.PlayCoinAnim(1, 5, this.moveSheep.node);
         }
         
     }

assets/script/game/game/ChangeAni.ts

@@ -25,6 +25,7 @@ export default class ChangeAni extends cc.Component {
         {
             this.sheepAni.play('sheepStand');
             this.hb_node.active = true;
+            //this.hb_node.setPosition(this.node.position.add(cc.v3(0, 82, 0)));
         }
     }
 }

assets/script/game/game/Farmer.ts

@@ -11,13 +11,22 @@ export class Farmer extends cc.Component {
     @property({ type: cc.Sprite, tooltip: "动画组件" }) forwardMask: cc.Sprite = null;
     @property({ type: cc.Sprite, tooltip: "动画组件" }) backMask: cc.Sprite = null;
 
+    @property({displayName: '飞红包节点', type: cc.Node})
+    private fly_node: cc.Node = null;
+
     private clips: cc.AnimationClip[] = [];
+
+    private refreshTime: number = 0;
+    private redMoneyNum: number = 0;
     
     start(){
 
         this.clips = this.animation.getClips();
+
+        this.refreshTime = 2.5;
+        this.redMoneyNum = 3;
     }
-    update() {
+    update(dt) {
         if (this.walk.curTargetPoint && this.walk.curTargetPoint.x > this.node.position.x) {
             this.node.setScale(cc.v3(-1, 1, 1));
         } else {
@@ -32,6 +41,14 @@ export class Farmer extends cc.Component {
                 this.forwardMask.node.active = !(this.backMask.node.active = false);
             }
         }
+return;
+        if(this.refreshTime >=0)
+        {
+            this.refreshTime -= dt;
+        }else{
+            this.refreshTime = 2.5;
+            mk.fly.PlayCoinAnim(1, 3, this.fly_node, '', null,2);
+        }
     }
 }
 

assets/script/game/game/Game.ts

@@ -153,7 +153,9 @@ export default class Game extends cc.Component {
     }
 
     private changeInfo() {
-        this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.gameData.redMoney);
+        //this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.gameData.redMoney);
+        cc.tween(this.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
+        this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
         gData.gameData.init_coin = false;
     }
 

assets/script/mk/system/FlySystem.ts

@@ -20,7 +20,7 @@ export default class FlySystem extends cc.Component {
      * @param endpos 飞行目标的世界坐标 或目标对象路径  如果为""，则飞到主界面货币按钮处 默认""
      * @param cb 动画结束回调
     */
-    public async PlayCoinAnim(type: number = 0, num: number, startpos_node: cc.Node, endpos: cc.Vec2 | string = '', item_cb: Function = null) {
+    public async PlayCoinAnim(type: number = 0, num: number, startpos_node: cc.Node, endpos: cc.Vec2 | string = '', item_cb: Function = null, averageValue: number = -1) {
         for (let i = 0; i < num; i++) {
             let copyCoin = await mk.pool.getPrefab('game/prefab/coin');
             let url = 'game/texture/coin/' + type;
@@ -41,26 +41,27 @@ export default class FlySystem extends cc.Component {
             let initPos = pos.add(deltaInit);
             copyCoin.setPosition(pos);
 
-            this.FlyIn(type, copyCoin, initPos, endpos, item_cb);
+            this.FlyIn(type, copyCoin, initPos, endpos, item_cb, averageValue);
         }
         this.is_new_cb = true;
     }
 
-    private FlyIn(type: number, target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, item_cb: Function = null) {
+    private FlyIn(type: number, target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, item_cb: Function = null, averageValue: number = -1) {
         cc.tween(target)
             .to(mk.math.random(0.3, 0.6, false), { position: cc.v3(end) }, cc.easeSineInOut())
             .call(() => {
-                this.FlyOut(type, target, endpos, item_cb);
+                this.FlyOut(type, target, endpos, item_cb, averageValue);
             })
             .start();
     }
 
-    private FlyOut(type: number, target: cc.Node, end: cc.Vec2 | string, item_cb: Function = null) {
+    private FlyOut(type: number, target: cc.Node, end: cc.Vec2 | string, item_cb: Function = null, averageValue: number = -1) {
         let dur = mk.math.random(0.3, 1, false);
         cc.tween(target)
             .to(dur, { scale: 0.8 })
             .start();
 
+            console.log('---');
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {
@@ -91,16 +92,22 @@ export default class FlySystem extends cc.Component {
             .to(dur, { position: cc.v3(end_pos) }, cc.easeSineOut())
             .call(() => {
                 console.log('end_pos  ', target.position)
-                mk.pool.return('game/prefab/coin', target);
-                if (end_node) {
-                    cc.tween(end_node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
+                
+                // if (end_node) {
+                //     cc.tween(end_node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
+                // }
+                if(averageValue != -1)
+                {
+                    this.showLabStrChange(averageValue);
                 }
 
                 if (item_cb != null) {
                     this.is_new_cb && item_cb();
                     this.is_new_cb = false;
                 }
-                this.iconScale(type);
+                //this.iconScale(type);
+
+                mk.pool.return('game/prefab/coin', target);
             })
             .start();
     }
@@ -113,15 +120,22 @@ export default class FlySystem extends cc.Component {
     private iconScale(type: number) {
         let node;
         if (type === 1) {
-            node = gData.gameData.gameStyle.icon_hb;
+            node = gData.gameData.gameStyle.lbl_redMoney.node;
         } else if (type === 3) {
-            node = gData.gameData.gameStyle.icon_zb;
+            node = gData.gameData.gameStyle.lbl_redMoney.node;
         }
         if (!node) return;
-        let scale1 = cc.tween().to(0.05, { scale: 0.9 });
-        let scale2 = cc.tween().to(0.05, { scale: 1 });
-        let seque = cc.tween().sequence(scale1, scale2);
-        cc.tween(node).then(seque).repeat(2).start();
+        cc.tween(node).to(0.1, { scale: 1.3 }).to(0.05, { scale: 1 }).start();
+    }
+
+    private showLabStrChange(value: number)
+    {
+        if(gData.gameData.gameStyle.lbl_redMoney)
+        {
+            gData.gameData.gameData.redMoney += value;
+            //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.gameData.redMoney.toString();
+            //cc.tween(gData.gameData.gameStyle.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
+        }
     }
 
     /**

assets/script/mk/system/PoolSystem.ts

@@ -43,7 +43,7 @@ export default class PoolSystem {
         } else {
             let prefab = await mk.loader.load(url, cc.Prefab);
             node = cc.instantiate(prefab);
-            pool && pool.put(node);
+            //pool && pool.put(node);
         }
         return node;
     }

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

@@ -10,9 +10,9 @@
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
+            <option value="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/android-libcocos2dx.iml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="PROJECT_TYPE" value="1" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+  </component>
+</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -33,6 +33,159 @@
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/2d" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/base" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/math" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/network" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
+    </content>
+    <content url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures">
+      <sourceFolder url="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/sources/android/cpufeatures" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../Classes">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
+    </content>
     <content url="file://$MODULE_DIR$/../../../app">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
@@ -102,18 +255,24 @@
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.externalNativeBuild" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
     </content>
+    <content url="file://$MODULE_DIR$/../../../jni/hellojavascript">
+      <sourceFolder url="file://$MODULE_DIR$/../../../jni/hellojavascript" isTestSource="false" />
+    </content>
     <content url="file://$MODULE_DIR$/../../../res">
       <sourceFolder url="file://$MODULE_DIR$/../../../res" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 31 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-game-9.2.0+G.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/utdid4all-1.5.2.1-proguard.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
@@ -174,5 +333,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="module" module-name="android-libcocos2dx" />
   </component>
 </module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/proj.android-studio.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="proj.android-studio" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="proj.android-studio" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

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

@@ -18,13 +18,13 @@
 # org.gradle.parallel=true
 
 # Android SDK version that will be used as the compile project
-PROP_COMPILE_SDK_VERSION=31
+PROP_COMPILE_SDK_VERSION=29
 
 # Android SDK version that will be used as the earliest version of android this application can run on
 PROP_MIN_SDK_VERSION=21
 
 # Android SDK version that will be used as the latest version of android this application has been tested on
-PROP_TARGET_SDK_VERSION=31
+PROP_TARGET_SDK_VERSION=29
 
 # Android Build Tools version that will be used as the compile project
 PROP_BUILD_TOOLS_VERSION=28.0.3
@@ -36,10 +36,10 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=C:/CocosDashboard_1.0.12/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
-RELEASE_STORE_PASSWORD=123456
-RELEASE_KEY_ALIAS=debug_keystore
-RELEASE_KEY_PASSWORD=123456
+#RELEASE_STORE_FILE=D:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
+RELEASE_STORE_PASSWORD=szmoka
+RELEASE_KEY_ALIAS=mokakey
+RELEASE_KEY_PASSWORD=szmoka
 
 android.injected.testOnly=false
 

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

@@ -200,6 +200,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.labTitle = null;
 e.labDes = null;
 e.sp = null;
+e.labBtn = null;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -218,8 +219,9 @@ return [ 3, 3 ];
 return [ 3, 5 ];
 
 case 1:
-this.labTitle.string = "农作物生虫了";
+this.labTitle.string = "农作物生虫了，无法收获";
 this.labDes.string = "看视频消灭害虫";
+this.labBtn.string = "消灭害虫";
 t = this.sp;
 return [ 4, mk.loader.load("game/coregame/texture/warning/warning_1", cc.SpriteFrame) ];
 
@@ -228,8 +230,9 @@ t.spriteFrame = n.sent();
 return [ 3, 7 ];
 
 case 3:
-this.labTitle.string = "动物生病了";
-this.labDes.string = "看视频治疗动物";
+this.labTitle.string = "动物生病了，无法收获";
+this.labDes.string = "看视频恢复健康";
+this.labBtn.string = "恢复健康";
 e = this.sp;
 return [ 4, mk.loader.load("game/coregame/texture/warning/warning_2", cc.SpriteFrame) ];
 
@@ -238,8 +241,9 @@ e.spriteFrame = n.sent();
 return [ 3, 7 ];
 
 case 5:
-this.labTitle.string = "工厂出故障了";
-this.labDes.string = "看视频修复工厂";
+this.labTitle.string = "商铺停电了，无法收获";
+this.labDes.string = "看视频恢复供电";
+this.labBtn.string = "恢复供电";
 o = this.sp;
 return [ 4, mk.loader.load("game/coregame/texture/warning/warning_3", cc.SpriteFrame) ];
 
@@ -278,6 +282,10 @@ i([ u({
 type: cc.Sprite,
 tooltip: "故障图标"
 }) ], e.prototype, "sp", void 0);
+i([ u({
+type: cc.Label,
+tooltip: "按钮文字"
+}) ], e.prototype, "labBtn", void 0);
 return i([ p ], e);
 }(cc.Component);
 o.default = d;
@@ -7873,6 +7881,7 @@ e.normalProgress = null;
 e.normalCount = null;
 e.ripedIcon = null;
 e.sickIcon = null;
+e.clockIcon = null;
 e.counting = !1;
 e.ripeTime = 0;
 e.totleTime = 0;
@@ -7882,9 +7891,11 @@ return e;
 }
 e.prototype.setData = function(t) {
 return r(this, void 0, void 0, function() {
-var e;
-return c(this, function() {
-if (!this.isDataed) {
+var e, o;
+return c(this, function(n) {
+switch (n.label) {
+case 0:
+if (this.isDataed) return [ 3, 2 ];
 this.isDataed = !0;
 e = gData.gameData.getProductMap(t.productID);
 this.ripeTime = t.growSpan;
@@ -7894,8 +7905,17 @@ this.sickIcon.active = !1;
 this.counting = !0;
 this.normalCount.string = "";
 this.normalProgress.fillRange = 0;
-}
+if (!this.clockIcon) return [ 3, 2 ];
+o = this.clockIcon;
+return [ 4, mk.loader.load("game/coregame/texture/factory_icons/factory_" + e.picture, cc.SpriteFrame) ];
+
+case 1:
+o.spriteFrame = n.sent();
+n.label = 2;
+
+case 2:
 return [ 2 ];
+}
 });
 });
 };
@@ -7938,7 +7958,7 @@ this.ripedIcon.active = !0;
 e.prototype.riped = function() {
 this.counting = !1;
 this.normalGroup.active = !1;
-if (Math.random() < .4) {
+if (Math.random() < .2) {
 this.sickIcon.active = !0;
 this.onSick && this.onSick.emit(null);
 } else {
@@ -7978,6 +7998,10 @@ i([ d({
 type: cc.Node,
 tooltip: "生病图标"
 }) ], e.prototype, "sickIcon", void 0);
+i([ d({
+type: cc.Sprite,
+tooltip: "生病图标"
+}) ], e.prototype, "clockIcon", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.FarmCountDown = h;
@@ -8479,7 +8503,7 @@ return r(this, void 0, void 0, function() {
 return c(this, function() {
 switch (this.data.state) {
 case s.FarmState.Lock:
-mk.tip.pop("请先解锁扩建农田");
+mk.tip.pop("点击拓建即可解锁农田");
 break;
 
 case s.FarmState.CanUnlock:
@@ -10711,12 +10735,12 @@ this._farmData || (this._farmData = []);
 var t = this._farmData.length;
 if (t < 18) {
 for (var e = 31e3, o = null, n = 0; n < 18; n++) {
-o = n < 3 ? {
+o = n < 6 ? {
 id: e,
 state: s.Empty,
 productID: 0,
 growSpan: 0
-} : 3 == n ? {
+} : 6 == n ? {
 id: e,
 state: s.CanUnlock,
 productID: 0,
@@ -18656,7 +18680,7 @@ if (!i) {
 s = this.getDesByType();
 p = gData.gameData.getProductMap(this.data.picture - 1).name;
 if (t.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
-this.labUnlock.string = "" + s + this.data.value + "次(" + r + "/" + this.data.value + ")\n" + p;
+this.labUnlock.string = r + "/" + this.data.value + "\n" + s + this.data.value + "次\n" + p;
 this.labUnlock.node.active = !0;
 } else this.labUnlock.node.active = !1;
 }

packages-hot-update/cfg.json

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