fengcong 5 лет назад
Родитель
Сommit
e5a46aa400

+ 115 - 2
assets/resources/game/prefab/nodepool/CellItem.prefab

@@ -19,16 +19,19 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 6
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 6
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 10
     },
     "_opacity": 255,
     "_color": {
@@ -220,6 +223,113 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "spr_redPacketIcon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 83,
+      "height": 78
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        15,
+        -15,
+        0,
+        0,
+        0,
+        0,
+        1,
+        -0.5,
+        0.5,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "9c7771f6-3761-476c-a467-e8b449080e65"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43529976-dd3c-4e7d-9c15-28537bac2f0b"
+    },
+    "fileId": "10MDEwKB1Aros1Lqj95VzI",
+    "sync": false
+  },
+  {
     "__type__": "0eddale281LjITR1VBVSkdJ",
     "_name": "",
     "_objFlags": 0,
@@ -233,6 +343,9 @@
     "spr_cellItemIcon": {
       "__id__": 3
     },
+    "spr_redPackIcon": {
+      "__id__": 7
+    },
     "_id": ""
   },
   {

Разница между файлами не показана из-за своего большого размера
+ 7724 - 15
assets/scene/MainScene.fire


+ 23 - 5
assets/script/before/GamePlay.ts

@@ -292,6 +292,10 @@ export default class GamePlay extends cc.Component {
         let progress = this.curProgressScore / this.targetScore;
         progress = progress > 1 ? 1 : progress;
         this.spr_progress.fillRange = progress;
+        if (progress >= 1) {
+            this.gameCount();
+            mk.ui.openPanel("module/reward/rewardMission");
+        }
         // LogUtil.log("progressprogressprogressprogressprogressprogress", progress);
     }
 
@@ -364,6 +368,7 @@ export default class GamePlay extends cc.Component {
         this.curXIndex++;
         if (this.curXIndex >= GameConst.col_num) {
             this.unschedule(this.addCellItemFuc);
+            this.getStartRedPacketCellItem();
         }
     }
 
@@ -600,25 +605,33 @@ export default class GamePlay extends cc.Component {
     /**
      * 获取红包cellItem
      */
-    public getRedPacketCellItem() {
+    public getStartRedPacketCellItem() {
         let totalCellItemArr: CellItem[] = this.cellItemArr.concat();
         let largeCellItemVec: cc.Vec2[] = [];
         for (var i = 0; i < totalCellItemArr.length; i++) {
-            let cellItem = totalCellItemArr[0];
+            let cellItem = totalCellItemArr[i];
             if (!!cellItem) {
-                GameLogic.getCouldCleanVecList(cellItem.x, cellItem.y, cellItem.type, false);
+                GameLogic.getCouldCleanVecList(cellItem.x, cellItem.y, cellItem.type, true);
+                // console.log("this.couldCleanVecArr", this.couldCleanVecArr);
+                console.log("largeCellItemVec.length", largeCellItemVec.length)
                 if (largeCellItemVec.length < this.couldCleanVecArr.length) {
                     largeCellItemVec = this.couldCleanVecArr;
+
                 }
                 this.couldCleanVecArr.forEach(element => {
-                    let index = GameConst.col_num * element.x + element.y;
+                    let index = GameConst.col_num * element.x + (GameConst.row_num - 1 - element.y);
                     totalCellItemArr[index] = null;
+                    this.cellItemDic[element.x][element.y].ifRemoved = false;
                 });
+                this.couldCleanVecArr = [];
             }
         }
+        console.log("FC------------------------------------------------------------");
         let random_index = mk.math.random(0, largeCellItemVec.length - 1);
         let vec = largeCellItemVec[random_index];
-        let redPcaketCellItem = this.cellItemDic[vec.x][vec.y];
+        let redPcaketCellItem: CellItem = this.cellItemDic[vec.x][vec.y];
+        redPcaketCellItem.showRedPacket();
+        return redPcaketCellItem;
     }
 
     //自定义事件---------------------------------------------------------------------
@@ -965,6 +978,11 @@ export default class GamePlay extends cc.Component {
             mk.ui.closePanel("GetPropUI");
         }
 
+        let node_rewardLcuk = mk.ui.getCurOnPanel("rewardLuck")
+        if (node_rewardLcuk) {
+            mk.ui.closePanel("rewardLuck");
+        }
+
         this.gameOver();
     }
 

+ 19 - 5
assets/script/before/view/uiItem/CellItem.ts

@@ -19,6 +19,9 @@ export default class CellItem extends cc.Component {
     /**cellItem的Icon图 */
     @property(cc.Sprite)
     spr_cellItemIcon: cc.Sprite = null;
+    /**cellItem的Icon图 */
+    @property(cc.Sprite)
+    spr_redPackIcon: cc.Sprite = null;
 
     /**纵列数 */
     public x: number = 0;
@@ -30,7 +33,7 @@ export default class CellItem extends cc.Component {
     public ifRemoved: boolean = false;
 
     /**是否有红包 */
-    public ifRedPacket:boolean = false;
+    public ifRedPacket: boolean = false;
 
     // LIFE-CYCLE CALLBACKS:
 
@@ -57,7 +60,7 @@ export default class CellItem extends cc.Component {
         this.node.y = cc.winSize.height * 0.5 + this.node.height + 50;
 
         this.ani_cellItem.play();
-         
+
         //LogUtil.log("[CellItem] init", this.x, this.y, endPos);
 
         this.setType();
@@ -109,7 +112,7 @@ export default class CellItem extends cc.Component {
         // LogUtil.log("lastType", lastType);
         // LogUtil.log("type", type);
         if (!lastType || lastType != this.type) {
-            mk.loader.load(`game/texture/cellItemIcon/${GameConst.iconIndex}/${this.type}`,cc.SpriteFrame).then((spriteFrame)=>{
+            mk.loader.load(`game/texture/cellItemIcon/${GameConst.iconIndex}/${this.type}`, cc.SpriteFrame).then((spriteFrame) => {
                 this.spr_cellItemIcon.spriteFrame = spriteFrame;
             })
         }
@@ -264,7 +267,7 @@ export default class CellItem extends cc.Component {
             .to(0.2, { x: endX })
             .call(() => {
                 if (ifLastCellItem) {
-                    mk.console.log("检测是否能消除!!!!!!!!!!!!!!!!!!!!!!!!!!最后移除"); 
+                    mk.console.log("检测是否能消除!!!!!!!!!!!!!!!!!!!!!!!!!!最后移除");
 
                     //先注释 避免重复判断 
                     GamePlay.Inst.checkIfEliminate();
@@ -286,6 +289,11 @@ export default class CellItem extends cc.Component {
         this.ani_cellItem.play();
     }
 
+    /** */
+    showRedPacket() {
+        this.spr_redPackIcon.node.active = true;
+    }
+
     /**
      * 回收
      * @param recycleType 回收类型 
@@ -345,9 +353,15 @@ export default class CellItem extends cc.Component {
                 let node_scoreEnergy = PoolMgr.Inst.getPoolPrefab(NODEPOOLPREFABTYPE.ScoreEnergy);
                 node_scoreEnergy.getComponent(ScoreEnergy).init(x, y, score);
                 GamePlay.Inst.node_effectUI.addChild(node_scoreEnergy);
+
+                if (this.spr_redPackIcon.node.active) {
+                    mk.ui.openPanel("module/reward/rewardLuck");
+                }
             }
         }
-
+        if (this.spr_redPackIcon.node.active) {
+            this.spr_redPackIcon.node.active = false;
+        }
         //回收
         PoolMgr.Inst.recyclePoolPrefab(NODEPOOLPREFABTYPE.CellItem, this.node);
     }

+ 18 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.command.txt

@@ -0,0 +1,18 @@
+Executable : D:\Android\SDK\ndk\21.3.6528147\ndk-build.cmd
+arguments : 
+NDK_PROJECT_PATH=null
+APP_BUILD_SCRIPT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Android.mk
+NDK_APPLICATION_MK=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\jni\Application.mk
+APP_ABI=armeabi-v7a
+NDK_ALL_ABIS=armeabi-v7a
+NDK_DEBUG=1
+APP_PLATFORM=android-16
+NDK_OUT=D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj
+NDK_LIBS_OUT=D:\App\mk_framework\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\debug\lib
+NDK_TOOLCHAIN_VERSION=clang
+NDK_MODULE_PATH=D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\cocos;D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x\external
+-j8
+NDK_DEBUG=1
+D:/App/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libcocos2djs.so
+jvmArgs : 
+

+ 95 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt

@@ -0,0 +1,95 @@
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/ScriptEngine.cpp:47:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1 warning generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.cc:1:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1 warning generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:6:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:402:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    obj->Set(env->context(), env->errno_string(), Integer::New(env->isolate(), errorno));
+    ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:403:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    obj->Set(env->context(), env->code_string(), estring);
+    ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:406:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        obj->Set(env->context(), env->path_string(), path_string);
+        ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:410:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        obj->Set(env->context(), env->syscall_string(), OneByteString(env->isolate(), syscall));
+        ^~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:480:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    e->Set(env->context(), env->errno_string(), Integer::New(isolate, errorno));
+    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:481:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    e->Set(env->context(), env->code_string(), js_code);
+    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:482:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    e->Set(env->context(), env->syscall_string(), js_syscall);
+    ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:484:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        e->Set(env->context(), env->path_string(), js_path);
+        ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:486:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        e->Set(env->context(), env->dest_string(), js_dest);
+        ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:805:66: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
+                      OneByteString(env->isolate(), NODE_VERSION + 1));
+                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:731:9: note: expanded from macro 'READONLY_PROPERTY'
+        var,                                               \
+        ^~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:805:66: note: use array indexing to silence this warning
+                      OneByteString(env->isolate(), NODE_VERSION + 1));
+                                                                 ^
+                                                    &            [
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:731:9: note: expanded from macro 'READONLY_PROPERTY'
+        var,                                               \
+        ^
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:911:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        arguments->Set(env->context(), i, String::NewFromUtf8(env->isolate(), argv[i], v8::NewStringType::kNormal).ToLocalChecked());
+        ^~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:913:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    process->Set(env->context(), FIXED_ONE_BYTE_STRING(env->isolate(), "argv"), arguments);
+    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:918:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+        exec_arguments->Set(env->context(), i, String::NewFromUtf8(env->isolate(), exec_argv[i], v8::NewStringType::kNormal).ToLocalChecked());
+        ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:920:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    process->Set(env->context(), FIXED_ONE_BYTE_STRING(env->isolate(), "execArgv"),
+    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:1130:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    process->Set(env->context(),env->events_string(), events_obj);
+    ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+16 warnings generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
+  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2 warnings generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cc:5:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1 warning generated.
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/editor-support/dragonbones/parser/JSONDataParser.cpp:498:13: warning: enumeration value 'Path' not handled in switch [-Wswitch]
+    switch (type)
+            ^
+1 warning generated.
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/external/sources/tremolo/Tremolo/floor0.c:61:13: warning: shifting a negative signed value is undefined [-Wshift-negative-value]
+  if(a<(-140<<12)) return 0;
+        ~~~~^
+1 warning generated.
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/jni/JniImp.cpp:313:5: warning: control reaches end of non-void function [-Wreturn-type]
+    }
+    ^
+1 warning generated.

+ 375 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -0,0 +1,375 @@
+Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
+Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectVariant.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_video_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocketServer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_webview_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket_server.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_auto.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= mp3reader.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= tinysndfile.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
+[armeabi-v7a] Compile++ arm  : cocos2djs <= main.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= cocos2d.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_dragonbones_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MathUtil.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGeometry.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCVertex.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat4.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Quaternion.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec2.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec3.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec4.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat3.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCAutoreleasePool.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRef.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCConfiguration.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= base64.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= TGAlib.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCValue.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCThreadPool.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ZipUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccRandom.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc1.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc2.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= pvr.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUTF8.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLog.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGLUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCScheduler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= csscolorparser.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= LocalStorage-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_opengl_utils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Uri.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HttpClient-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= JavaScriptJavaBridge.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_classtype.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_extension_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= config.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_opengl_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MappingUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_conversions.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RefCounter.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_platform_android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Value.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ObjectWrap.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Object.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= tinyxml2.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi_mem.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Utils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= unzip.cpp
+[armeabi-v7a] Compile arm    : cocos2dx_static <= ConvertUTF.c
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= edtaa3func.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SHA1.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EditBox-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontAtlas.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontFreetype.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelAtlasCache.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= util.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= env.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelRenderer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket.cc
+[armeabi-v7a] Compile arm    : cocos2dx_static <= http_parser.c
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFXUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_agent.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_io.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket_server.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Types.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= FrameBuffer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= DeviceGraphics.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFX.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= GraphicsHandle.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= IndexBuffer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderBuffer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderTarget.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture2D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VertexBuffer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VertexFormat.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Config.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= InputAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Effect.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Camera.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Light.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Model.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Pass.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= View.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Scene.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Technique.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ProgramLib.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerBase.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CustomAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ForwardRenderer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Assembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= TiledMapAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerSprite.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite3D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite2D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite3D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Particle3DAssembler.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshBuffer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= StencilManager.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MemPool.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ParallelTask.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeMemPool.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderFlow.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeProxy.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= VideoPlayer-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebViewImpl-android.cpp
+[armeabi-v7a] Compile++ arm  : cocos_extension_static <= CCEventAssetsManagerEx.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AssetFd.cpp
+[armeabi-v7a] Compile++ arm  : cocos_extension_static <= CCAsyncTaskPool.cpp
+[armeabi-v7a] Compile++ arm  : cocos_extension_static <= Manifest.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoder.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderProvider.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderSLES.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderOgg.cpp
+[armeabi-v7a] Compile++ arm  : cocos_extension_static <= AssetsManagerEx.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderWav.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResampler.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmBufferProvider.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioPlayer.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= UrlAudioPlayer.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixerController.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
+[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
+[armeabi-v7a] Compile++ thumb: audioengine_static <= Track.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixer.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= minifloat.cpp
+[armeabi-v7a] Compile thumb  : audioengine_static <= primitives.c
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_helper.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= Utils.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= IOBuffer.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MeshBuffer.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= middleware-adapter.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= IOTypedArray.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationStateData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Atlas.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AtlasAttachmentLoader.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Attachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentLoader.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_editor_support_auto.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BoneData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ClippingAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ColorTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CurveTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DeformTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DrawOrderTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Event.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= EventData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= EventTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Extension.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraintData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraint.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= IkConstraintTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Json.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= LinkedMesh.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MathUtil.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MeshAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraint.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintMixTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintPositionTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PathConstraintSpacingTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= PointAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= RegionAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= RotateTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= RTTI.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ScaleTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ShearTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Skeleton.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonBinary.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonBounds.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonClipping.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonJson.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Skin.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SlotData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SpineObject.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TextureLoader.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Timeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraint.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TranslateTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Triangulator.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Updatable.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffect.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentVertices.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonDataMgr.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffectDelegate.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonAnimation.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= spine-cocos2dx.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonRenderer.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCacheMgr.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCache.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkeletonCacheAnimation.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseTimelineState.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= WorldClock.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TimelineState.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Armature.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DeformVertices.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TransformObject.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseObject.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Point.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Transform.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationConfig.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BaseFactory.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DisplayData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= SkinData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TextureAtlasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= UserData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DataParser.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= BinaryDataParser.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CCTextureAtlasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureDisplay.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CCSlot.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CCFactory.cpp
+[armeabi-v7a] Compile arm    : vorbisidec <= bitwise.c
+[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
+[armeabi-v7a] Compile arm    : vorbisidec <= dsp.c
+[armeabi-v7a] Compile arm    : vorbisidec <= floor0.c
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCacheMgr.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
+[armeabi-v7a] Compile arm    : vorbisidec <= floor1.c
+[armeabi-v7a] Compile arm    : vorbisidec <= floor_lookup.c
+[armeabi-v7a] Compile arm    : vorbisidec <= info.c
+[armeabi-v7a] Compile arm    : vorbisidec <= mapping0.c
+[armeabi-v7a] Compile arm    : vorbisidec <= framing.c
+[armeabi-v7a] Compile arm    : vorbisidec <= misc.c
+[armeabi-v7a] Compile arm    : vorbisidec <= mdct.c
+[armeabi-v7a] Compile arm    : vorbisidec <= res012.c
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureCacheDisplay.cpp
+[armeabi-v7a] Compile arm    : vorbisidec <= vorbisfile.c
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_crc.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_header.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_huff_cw.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_getbits.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dequantize_sample.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_main_data_size.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_side_info.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_data.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_factors.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_stereo_proc.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_decoding.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_tables.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_parsing.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_imdct_synth.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mdct_6.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dct_6.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_poly_phase_synthesis.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_equalizer.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_seek_synch.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
+[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_polyphase_filter_window_gcc.s
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
+[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_mdct_18_gcc.s
+[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_9_gcc.s
+[armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_16_gcc.s
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCDevice-android.cpp
+[armeabi-v7a] StaticLibrary  : libextension.a
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCFileUtils-android.cpp
+[armeabi-v7a] StaticLibrary  : libaudioengine.a
+[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
+[armeabi-v7a] StaticLibrary  : libvorbisidec.a
+[armeabi-v7a] StaticLibrary  : libcpufeatures.a
+[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniHelper.cpp
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCApplication-android.cpp
+[armeabi-v7a] StaticLibrary  : libeditorsupport.a
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniImp.cpp
+[armeabi-v7a] StaticLibrary  : libcocos2d.a
+[armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCCanvasRenderingContext2D-android.cpp
+[armeabi-v7a] StaticLibrary  : libcocos2dandroid.a
+[armeabi-v7a] SharedLibrary  : libcocos2djs.so

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

@@ -4,23 +4,74 @@ import android.content.Context;
 import android.util.Log;
 
 import org.cocos2dx.javascript.AppActivity;
+import org.cocos2dx.javascript.util.DeviceUtil;
+import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
+
+import com.aries.ttaxx.BuildConfig;
 import com.aries.ttaxx.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 
+    /** 日志标签 */
     private static String _Tag = "[ThirdMgr]-------:";
-    /**  */
+
+    /** 主活动进程 */
     public static AppActivity appActivity = null;
-    /** */
+    /** 微信 */
     public static WXEntryActivity wxEntryActivity = null;
+    private static DeviceUtil DevicesUtil;
 
     public static void regToWx()
     {
         WXEntryActivity.getInstance().regToWx(ThirdSdkMgr.appActivity);
     }
 
+    //Cocos 对应与Java交互的脚本
+    public static String cocosJsbMgrName = "window.JsbMgr.";
+
+    //微信相关
+    /** 微信授权 */
     public static void WxAuth()
     {
         WXEntryActivity.getInstance().startWxAuth(ThirdSdkMgr.appActivity);
     }
+
+    //设备信息相关
+    /** 获取设备信息 */
+    public static void getDeviceInfo() {
+        Log.d("[ThirdSdkMgr] ","getDeviceInfo");
+        //获取安卓id
+        String ANDROID_ID = DevicesUtil.getAndroidId(appActivity);
+        //获取Oaid
+        String mOAID = DevicesUtil.getOaid();
+        //获取IMEI号
+        String imei1 = DevicesUtil.getImei(appActivity);
+        //获取mac
+        String mac = DevicesUtil.getMac(appActivity);
+        //获取版本名称
+        String versionName = DevicesUtil.getVersionName(appActivity);
+        //获取友盟的channel
+        String umengChannel = BuildConfig.UM_CHANNEL;
+        //获取设备类型
+        String deviceType = DevicesUtil.getSystemVersion();
+        //获取安卓版本
+        String androidVersion = DevicesUtil.getSystemModel();
+
+        updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
+    }
+
+    /** 更新设备信息 */
+    public static void updateDeviceInfo(final String android_id, final String idfa, final String imei, final String mac,
+                                        final String oaid, final String umid, final String versionName,
+                                        final String umengChannel, final String deviceType, final String androidVersion) {
+//        android_id, idfa, imei, mac, oaid, umid
+        appActivity.runOnGLThread(new Runnable() {
+            @Override
+            public void run() {
+                String param =  android_id + "#" + idfa + "#" + imei + "#" + mac + "#" + oaid + "#" + umid + "#" + BuildConfig.TF_CHANNEL +
+                        "#" + versionName + "#" + umengChannel + "#" + deviceType + "#" + androidVersion ;
+                Cocos2dxJavascriptJavaBridge.evalString(cocosJsbMgrName + "updateDeviceInfo('" + param + "');");
+            }
+        });
+    }
 }

+ 194 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java

@@ -1,4 +1,198 @@
 package org.cocos2dx.javascript.util;
 
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.cocos2dx.javascript.thirdSdk.oaid.OaidHelper;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+
 public class DeviceUtil {
+
+
+    /**
+     * 是否支持Oaid
+     */
+    private static boolean isSupportOaid = true;
+    private static int errorCode;
+    public  static String oaid;
+
+    public static String getErrorCode() {
+        return String.valueOf(errorCode);
+    }
+
+    public static boolean isSupportOaid() {
+        return isSupportOaid;
+    }
+
+    public static void setIsSupportOaid(boolean isSupportOaid) {
+        DeviceUtil.isSupportOaid = isSupportOaid;
+    }
+
+    public static void setIsSupportOaid(boolean isSupportOaid, int ErrorCode) {
+        DeviceUtil.isSupportOaid = isSupportOaid;
+        DeviceUtil.errorCode = ErrorCode;
+    }
+
+    /**预先获取Oaid*/
+    public static void preGetOaid(Context context) {
+        Log.d("[DevicesUtil] ids","1");
+        //获取OAID等设备标识符
+        OaidHelper oaidHelper = new OaidHelper(appIdsUpdater);
+        oaidHelper.getDeviceIds(context);
+    }
+
+    public static OaidHelper.AppIdsUpdater appIdsUpdater = new OaidHelper.AppIdsUpdater() {
+        @Override
+        public void OnIdsAvalid(@NonNull String ids) {
+            Log.d("[DevicesUtil] ids2: ", ids);
+            DeviceUtil.oaid = ids;
+        }
+    };
+
+    /**
+     * 获取Oaid
+     */
+    public static String getOaid() {
+        String idfa;
+        if (DeviceUtil.isSupportOaid()) {
+            idfa = DeviceUtil.oaid;
+        } else {
+            idfa = null;
+            // idfa = "获取失败,ErrorCode: " + DEV.getErrorCode();
+            Log.d("获取失败,ErrorCode",DeviceUtil.getErrorCode());
+        }
+        return idfa;
+    }
+
+    //-------- 获取Imei --------
+    public static String getImei(Context context) {
+        String imei = "";
+        try {
+            TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            imei = tm.getDeviceId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imei;
+    }
+
+    //-------- 获取mac地址--------
+    public static String getMac(Context context) {
+        String strMac = null;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Log.e("=====", "6.0以下");
+            Toast.makeText(context, "6.0以下", Toast.LENGTH_SHORT).show();
+            strMac = getLocalMacAddressFromWifiInfo(context);
+            return strMac;
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Log.e("=====", "7.0以上");
+            strMac = getMac();
+            return strMac;
+        }
+        return "02:00:00:00:00:00";
+    }
+
+    /**
+     * 这是使用adb shell命令来获取mac地址的方式
+     *
+     * @return
+     */
+    public static String getMac() {
+        String macSerial = null;
+        String str = "";
+
+        try {
+            Process pp = Runtime.getRuntime().exec("ip addr");
+            InputStreamReader ir = new InputStreamReader(pp.getInputStream());
+            LineNumberReader input = new LineNumberReader(ir);
+
+            for (; null != str; ) {
+                str = input.readLine();
+                if (str != null) {
+                    macSerial = str.trim();// 去空格
+                    if (macSerial.indexOf("link/ether") != -1) {
+                        break;
+                    }
+                }
+            }
+        } catch (IOException ex) {
+            // 赋予默认值
+            ex.printStackTrace();
+        }
+//        Log.d("vvvvvvvvv  ", "getMac: " + macSerial);
+        String mac = "";
+        if (macSerial.split(" ").length >= 2) {
+            mac = macSerial.split(" ")[1];
+        }
+        return mac;
+    }
+
+    /**
+     * 根据wifi信息获取本地mac
+     *
+     * @param context
+     * @return
+     */
+    public static String getLocalMacAddressFromWifiInfo(Context context) {
+        WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiInfo winfo = wifi.getConnectionInfo();
+        String mac = winfo.getMacAddress();
+        return mac;
+    }
+
+    // Android Id
+    public static String getAndroidId(Context context) {
+        String androidId = Settings.Secure.getString(
+                context.getContentResolver(), Settings.Secure.ANDROID_ID);
+        return androidId;
+    }
+
+    /**
+     * 获取当前手机系统版本号
+     *
+     * @return 系统版本号
+     */
+    public static String getSystemVersion() {
+        return android.os.Build.VERSION.RELEASE;
+    }
+
+    /**
+     * 获取手机型号
+     *
+     * @return 手机型号
+     */
+    public static String getSystemModel() {
+        return android.os.Build.MODEL;
+    }
+
+    /**
+     * get App versionName
+     *
+     * @param context
+     * @return
+     */
+    public static String getVersionName(Context context) {
+        PackageManager packageManager = context.getPackageManager();
+        PackageInfo packageInfo;
+        String versionName = "";
+        try {
+            packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+            versionName = packageInfo.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return versionName;
+    }
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов