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

assets/resources/data/rule_data.json

@@ -77,7 +77,7 @@
 		"(用户协议作弊条款) ",
 		"　　d.对于应用中的金币奖励规则、活动规则、提现规则，本公司拥有最终解释权。 "
 	],
-	"pricacy": [
+	"privacy": [
 		"轻松消消乐隐私政策 ",
 		"",
 		"开发者公司： 苏州白羊座信息科技有限公司 ",

assets/script/game/data/AdData.ts

@@ -31,6 +31,23 @@ export class AdData {
     }
 
 
+    public updateData(placementId, data) {
+        mk.console.logSingle("updateADData:" + placementId, data);
+        this.placementId = placementId;
+        this.adunit_format = data.adunit_format;
+        this.network_type = data.network_type;
+        this.network_placement_id = data.network_placement_id;
+        this.network_firm_id = data.network_firm_id;
+        this.adsource_id = data.adsource_id;
+        this.adsource_index = data.adsource_index;
+        this.adsource_price = data.adsource_price;
+        this.adsource_isheaderbidding = data.adsource_isheaderbidding;
+        this.publisher_revenue = data.publisher_revenue;
+        this.precision = data.precision;
+        this.ecpm_level = data.ecpm_level;
+    }
+
+
     public async watchVideo(type: AdFun) {
         this.ad_subType = type;
         let data = {
@@ -41,6 +58,7 @@ export class AdData {
             "version": gData.appData.appVersion,
             "tf_channel": gData.appData.tfChannel,
             "destoon_ad_place": this.placementId,
+            "ad_type": 1,
             "adunit_format": this.adunit_format,
             "network_type": this.network_type,
             "network_placement_id": this.network_placement_id,
@@ -50,11 +68,14 @@ export class AdData {
             "adsource_price": this.adsource_price,
             "adsource_isheaderbidding": this.adsource_isheaderbidding,
             "publisher_revenue": this.publisher_revenue,
-            "precision": this.precision,
+            "precision_ecpm": this.precision,
             "ecpm_level": this.ecpm_level,
+            "cfg_version": gData.appData.version,
+            "adsource_ecpm": gData.gameData.adShowConfig.average_ecpm,
             "ad_sbuType": this.ad_subType,
-            "ad_type": 1,
         }
+        mk.console.logSingle("updateVideoData:",data);
+        
         let response = await mk.http.sendData('updateVideo', data);
         if (response.errcode != 0) {
             return;

assets/script/game/data/GameData.ts

@@ -17,8 +17,9 @@ export class GameData {
 
 
     public configs: any = {};
+    public adShowConfig:ADShowCfg;
     /** 功能开启 */
-    public funOpenData:string[] = [];
+    public funOpenData: string[] = [];
 
     public gameData: PlayerInfoType;
 
@@ -31,7 +32,7 @@ export class GameData {
 
     /** 主页样式脚本 */
     public gameStyle: Game = null;
-    
+
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -46,15 +47,23 @@ export class GameData {
             }
             return;
         }
-        mk.console.logSingle("getAllConfigInfo",response.data)
+        mk.console.logSingle("getAllConfigInfo", response.data);
         this.initConfigs(response.data);
 
         data = {};
+        response = await mk.http.sendData('user/adShowConfig', data);
+        if (response.errcode != 0) {
+            return;
+        }
+        this.adShowConfig = response.data;
+        mk.console.logSingle("user/adShowConfig", response.data);
+
+        data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
         if (response.errcode != 0) {
             return;
         }
-        mk.console.logSingle("getInfoCrypt",response.data)
+        mk.console.logSingle("getInfoCrypt", response.data);
         this.gameData = response.data;
 
         if (this.props == null) {
@@ -69,7 +78,7 @@ export class GameData {
         this.dataFinish = true;
     }
 
-    private initConfigs(data){
+    private initConfigs(data) {
         this.configs = data;
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
     }
@@ -203,23 +212,23 @@ export enum RewardType {
  */
 export enum AUDIO_TYPE {
     /**主界面背景音乐*/
-    bgm = 'bgm',                       
+    bgm = 'bgm',
     /**打开存钱罐界面播放一次*/
-    pigBank = 'pigBank',               
+    pigBank = 'pigBank',
     /**关卡玩法背景音乐*/
-    missionBg = 'missionBg',        
+    missionBg = 'missionBg',
     /**红包币领取界面关闭音效*/
-    rewardClose = 'rewardClose',      
+    rewardClose = 'rewardClose',
     /**红包币领取界面开启音效*/
-    rewardOpen = 'rewardOpen',       
+    rewardOpen = 'rewardOpen',
     /**红包界面打开音效*/
-    reward = 'reward',                
+    reward = 'reward',
     /**提现到账界面打开播放一次*/
-    receiptNotice = 'receiptNotice',  
+    receiptNotice = 'receiptNotice',
     /**通用按钮点击音效 */
-    button = 'button',             
+    button = 'button',
     /**转盘转动音效*/
-    turnableplay = 'turnableplay',     
+    turnableplay = 'turnableplay',
     /**主页背景音乐 */
     music_startBg = "music_startBg",
     /**游戏背景音乐 */
@@ -254,6 +263,14 @@ export enum AUDIO_TYPE {
     ef_fly = "ef_fly",
 }
 
+/** ECPM */
+type ADShowCfg = {
+    average_ecpm: number,
+    insert_probability: number,
+    is_show_banner: number,
+    is_show_inter: number,
+}
+
 type PlayerInfoType = {
     /** 自定义不需要校验的数据 */
     gameUserData: object,

assets/script/game/data/LoginData.ts

@@ -28,15 +28,31 @@ export class LoginData {
     /** 是否授权 */
     public isAuth: boolean;
 
+    /** 服务协议 */
+    public ruleStr:string;
 
+    /** 隐私协议 */
+    public privacyStr:string;
 
     /**
      * 初始化本地配置
      * @returns 
      */
-    public loadLocalRes() {
-        
-        this.loadResCompelete = true;
+    public async loadLocalRes() {
+        let result = await mk.loader.load("data/rule_data",cc.JsonAsset);
+        if(result && result.json){
+            this.ruleStr = '';
+            this.privacyStr = '';
+            let arr = result.json.server;
+            for(let i=0;i<arr.length;i++){
+                this.ruleStr += arr[i] + '\n';
+            }
+            arr = result.json.privacy;
+            for(let i=0;i<arr.length;i++){
+                this.privacyStr += arr[i] + '\n';
+            }
+            this.loadResCompelete = true;
+        }
     }
 
     /**

assets/script/game/module/setting/Rule.ts

@@ -22,7 +22,7 @@ export default class Rule extends cc.Component {
      * @param type 0服务协议  1隐私协议
      */
     public setContent(type: string = "0") {
-        this.lbl_content.string = type == "0" ? "服务协议" : "隐私协议";
+        this.lbl_content.string = type == "0" ? gData.loginData.ruleStr : gData.loginData.privacyStr;
         this.scrollView.scrollToTop();
     }
 

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

@@ -76,10 +76,11 @@ export class ATRewardVideo extends zgSingleton {
         //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
 
         //视频埋点开始
-        // let data = JSON.parse(callbackInfo)
+        let data = JSON.parse(callbackInfo);
         // HttpMgr.Inst.updateADLog(4, placementId, data.adunit_format, data.network_type, data.network_placement_id,
         //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
         //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level);
+        gData.adData.updateData(placementId,data);
 
         this.loadAd();
     }

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

@@ -84,13 +84,13 @@ export default class ATSDKMgr extends zgSingleton {
     watchVideoAdCallBack(adPlayStateType: AdPlayStateType) {
         switch (adPlayStateType) {
             case AdPlayStateType.WatchEnd:
-                // AdSystem.getInstance().wacthAdSuccess();
+                mk.ad.wacthAdSuccess();
                 break;
             case AdPlayStateType.PlayFail:
-                // AdSystem.getInstance().watchAdFail();
+                mk.ad.watchAdFail();
                 break;
             case AdPlayStateType.Cancel:
-                // AdSystem.getInstance().watchAdFail();
+                mk.ad.watchAdFail();
                 break;
         }
     }

assets/script/mk/system/AdSystem.ts

@@ -59,11 +59,13 @@ export default class AdSystem {
 
     /** 观看广告失败 */
     public watchAdFail() {
+        mk.console.log("watchAdFail");
         this.videoAdcallBack(false);
     }
 
     /** 观看广告取消 */
     public watchAdCancel() {
+        mk.console.log("watchAdCancel");
         this.videoAdcallBack(false);
     }
 
@@ -72,6 +74,7 @@ export default class AdSystem {
      * @param placementId 广告位id
      */
     public wacthAdSuccess(placementId = '') {
+        mk.console.log("wacthAdSuccess");
         this.videoAdcallBack(true);
     }
 

assets/script/mk/system/HttpSystem.ts

@@ -56,7 +56,7 @@ export default class HttpSystem {
                     if (httpRequest.status === 200) {
                         var responseStr = httpRequest.responseText;
                         let response = JSON.parse(responseStr);
-                        mk.console.log("response:", url, response)
+                        mk.console.logSingle("response:" + url, response)
                         resolve(response);
                     }
                     else {

assets/script/mk/utils/LogUtil.ts

@@ -94,7 +94,10 @@ export default class LogUtil {
      * @returns 
      */
     public logSingle(tag: string, obj: any, frontStrNum: number = 0) {
-
+        if (cc.sys.os != cc.sys.OS_ANDROID) {
+            this.log(tag, obj);
+            return;
+        }
         if (!this.ifShowLog) {
             return;
         }