11

assets/res/game/effect.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "fd92f3c6-5c6e-4494-bb9f-eee490eb1153",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/game/coregame/coregame.prefab

@@ -35215,8 +35215,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -40428,8 +40428,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -45769,8 +45769,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -50979,8 +50979,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -56192,8 +56192,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -61533,8 +61533,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -66743,8 +66743,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -71956,8 +71956,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -77297,8 +77297,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -80487,7 +80487,7 @@
         "__id__": 2392
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 2418
@@ -82507,8 +82507,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -87720,8 +87720,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -93061,8 +93061,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -98271,8 +98271,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -103484,8 +103484,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -108825,8 +108825,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -114035,8 +114035,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -119248,8 +119248,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,
@@ -124589,8 +124589,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2,
+        -9,
         0,
         0,
         0,

assets/resources/game/prefab/nodepool.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "6d082f49-ebbf-436b-8797-bd0e31a956d6",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

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

@@ -37,7 +37,7 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
 
         window['ATJSSDK'].setLogDebug(true);
         cc["ATSDKMgrJS"].proxy = this;
-        cc["ATSDKMgrJS"].initATJSSDK(ATSDKMgr.topon_android_appId, ATSDKMgr.topon_android_appSecret);
+        cc["ATSDKMgrJS"].initATJSSDK(ATSDKMgr.topon_android_appId, ATSDKMgr.topon_android_appSecret, gData.appData.umengChannel);
 
         //初始化激励视频广告
         ATRewardVideo.getInstance().init();

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgrJS.js

@@ -12,13 +12,12 @@ var ATSDKMgrJS = cc.Class({
     },
 
     /** 初始化Sdk */
-    initATJSSDK: function (appid, appsecret) {
-        
+    initATJSSDK: function (appid, appsecret, umchannel) {
+
         ATJSSDK.setLogDebug(true);
 
         var customMap = {
-            "appCustomKey1": "appCustomValue1",
-            "appCustomKey2": "appCustomValue2"
+            "channel": umchannel
         };
 
         ATJSSDK.initCustomMap(customMap);

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -89,6 +89,8 @@ public class AppActivity extends Cocos2dxActivity {
         filter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
         registerReceiver(NetWorkStateMgr.getInstance(), filter);
 
+        UMSDKMgr.getInstance().init();
+
 //        YSDKApi.setMainActivity("org.cocos2dx.javascript.AppActivity");
     }
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java

@@ -8,6 +8,8 @@ import com.aries.kxnly.mz.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 
+import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,8 +25,6 @@ public class UMSDKMgr {
         return mInstace;
     }
 
-    public Application myApplication = null;
-
     public void init(){
         Log.d("友盟SDK初始化","onCreate");
         //设置友盟SDK加密
@@ -40,16 +40,16 @@ public class UMSDKMgr {
      * appkey和channel参数必须和后续调用的UMConfigure.init初始化函数appkey、channel参数值一致。
      */
     public void _UMPREInit() {
-        UMConfigure.preInit(myApplication, BuildConfig.UM_AID, BuildConfig.UM_CHANNEL);
+        UMConfigure.preInit(ThirdSdkMgr.appActivity, BuildConfig.UM_AID, BuildConfig.UM_CHANNEL);
     }
 
     public void _UMSDKInit() {
-        if (this.myApplication == null) {
+        if (ThirdSdkMgr.appActivity == null) {
             Log.e("UMSDKMgr", "appActivity  is  null !!!!");
             return;
         }
 
-        UMConfigure.init(myApplication,
+        UMConfigure.init(ThirdSdkMgr.appActivity,
                 BuildConfig.UM_AID, BuildConfig.UM_CHANNEL, UMConfigure.DEVICE_TYPE_PHONE, BuildConfig.UM_SECRET);
     }