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

# Conflicts:
#	mk_framework/assets/resources/module/login/1.txt.meta

mk_framework/assets/resources/module/login/1.txt.meta

@@ -1,5 +1,5 @@
 {
   "ver": "2.0.0",
-  "uuid": "a009aa24-76ce-4f0a-aeb4-e1a6f182a8e0",
+  "uuid": "9690d210-3d7e-46e8-ad88-db732c94868d",
   "subMetas": {}
 }

mk_framework/assets/script/game/module/cash/sign.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "78c79a46-c440-4e5b-b8e4-f1a8aabb3092",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

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

@@ -26,7 +26,7 @@ export default class ATSDKMgr extends zgSingleton {
     public static topon_banner_placementId = "b5f8fa77aa5262";
 
     /**初始化ATSDK */
-    public initATSDK() {
+    public initSDK() {
 
         cc["ATSDKMgrJS"].proxy = this;
         cc["ATSDKMgrJS"].initATJSSDK(ATSDKMgr.topon_android_appId, ATSDKMgr.topon_android_appSecret);
@@ -39,6 +39,14 @@ export default class ATSDKMgr extends zgSingleton {
         // ATBanner.getInstance().init();
     }
 
+    placementID() {
+        if (cc.sys.os === cc.sys.OS_IOS) {
+            return ATSDKMgr.topon_rewardVideo_placementId;
+        } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+            return ATSDKMgr.topon_rewardVideo_placementId;
+        }
+    }
+
     /**显示视频广告 */
     showVideoAd() {
         ATRewardVideo.getInstance().showAd();
@@ -51,13 +59,13 @@ export default class ATSDKMgr extends zgSingleton {
     watchVideoAdCallBack(adPlayStateType: AdPlayStateType) {
         switch (adPlayStateType) {
             case AdPlayStateType.WatchEnd:
-                AdSystem.getInstance().wacthAdSuccess();
+                // AdSystem.getInstance().wacthAdSuccess();
                 break;
             case AdPlayStateType.PlayFail:
-                AdSystem.getInstance().watchAdFail();
+                // AdSystem.getInstance().watchAdFail();
                 break;
             case AdPlayStateType.Cancel:
-                AdSystem.getInstance().watchAdFail();
+                // AdSystem.getInstance().watchAdFail();
                 break;
         }
     }

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

@@ -51,6 +51,10 @@ var ATSDKMgrJS = cc.Class({
             }
         });
     },
+
+    placementID() {
+        return this.proxy.placementID();
+    }
 });
 
 module.exports = ATSDKMgrJS;

mk_framework/assets/script/mk/system/AdSystem.ts

@@ -1,5 +1,3 @@
-import ATSDKMgr from "../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr";
-import { zgSingleton } from "../sdk/ad/toppon/zgSingleton";
 import JsbSystem from "./JsbSystem";
 
 /**
@@ -7,12 +5,15 @@ import JsbSystem from "./JsbSystem";
  * @description 显示/播放广告
  * @author 冯聪
  */
-export default class AdSystem extends zgSingleton {
+export default class AdSystem {
 
-    constructor() {
-        super();
+    constructor(adSdk:any) {
+  
         this.init();
     }
+    
+    /** 广告sdk */
+    public adSdk: any = null;
 
     /** 是否显示广告 */
     public ifShowAd: boolean = false;
@@ -25,7 +26,7 @@ export default class AdSystem extends zgSingleton {
         //获取广告渠道id
         this.getAdvertiseChannel();
         //初始化Topon广告SDK
-        ATSDKMgr.getInstance().initATSDK();
+        this.adSdk.initATSDK();
     }
 
     /** 获取投放渠道 和 广告位ID信息 */
@@ -58,7 +59,7 @@ export default class AdSystem extends zgSingleton {
             if (cc.sys.platform != cc.sys.WECHAT_GAME) {
                 if (cc.sys.os == cc.sys.OS_ANDROID) {
                     // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
-                    ATSDKMgr.getInstance().showVideoAd();
+                    this.adSdk.showVideoAd();
                 }
                 else if (cc.sys.os == cc.sys.OS_IOS) {
                     jsb.reflection.callStaticMethod("AppController", "showVideo", "");
@@ -93,7 +94,7 @@ export default class AdSystem extends zgSingleton {
         if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             if (cc.sys.os == cc.sys.OS_ANDROID) {
                 // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
-                ATSDKMgr.getInstance().loadNativeAd(type, show);
+                this.adSdk.loadNativeAd(type, show);
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
 
@@ -109,7 +110,7 @@ export default class AdSystem extends zgSingleton {
         if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             if (cc.sys.os == cc.sys.OS_ANDROID) {
                 // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
-                ATSDKMgr.getInstance().destroyNativeAd();
+                this.adSdk.destroyNativeAd();
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
 

mk_framework/assets/script/mk/system/JsbSystem.ts

@@ -13,6 +13,7 @@ export default class JsbSystem {
     /**
      * 是否文件存在
      * @param filePath 文件路径 
+     * @returns 是否文件存在 boolean
      */
     public static isFileExit(filePath: string): boolean {
         return jsb.fileUtils.isFileExist(filePath);

mk_framework/assets/script/mk/system/MKSystem.ts

@@ -13,6 +13,9 @@ import StorageUtil from "../utils/StorageUtil";
 import TimerSystem from "./TimerSystem";
 import EventSystem from "./EventSystem";
 import MathUtil from "../utils/MathUtil";
+import AdSystem from "./AdSystem";
+import JsbSystem from "./JsbSystem";
+import ATSDKMgr from "../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr";
 
 /**
  * @description mk系统
@@ -39,13 +42,16 @@ class MKSystem {
 
     /** 系统管理 */
     data: DataSystem;
+    ad: AdSystem;
+    jsb: JsbSystem;
     http: HttpSystem;
     audio: AudioSystem;
-    /** 挂载在MainScene的界面上，不需要new */
-    ui: UISystem;
     timer: TimerSystem;
     event: EventSystem;
 
+    /** 挂载在MainScene的界面上，不需要new */
+    ui: UISystem;
+
     init() {
         //工具
         this.time = new TimeUtil();
@@ -64,10 +70,13 @@ class MKSystem {
         this.data = new DataSystem();
         this.http = new HttpSystem();
         this.audio = new AudioSystem();
+        this.ad = new AdSystem(ATSDKMgr.getInstance());
+        this.jsb = new JsbSystem();
 
         this.timer = new TimerSystem();
         this.event = new EventSystem();
 
+
     }
 }