future пре 1 година
родитељ
комит
2ca4dc7fe9

+ 4 - 4
assets/scene/game.scene

@@ -717,7 +717,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 8.893765606457674,
+      "width": 8.896250229473262,
       "height": 20.16
     },
     "_anchorPoint": {
@@ -750,7 +750,7 @@
     "_string": "0",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 18.679802955665025,
+    "_actualFontSize": 20.334975369458128,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_lineHeight": 16,
@@ -2809,7 +2809,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 87.51276420239155,
+      "width": 87.50582081402919,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -2842,7 +2842,7 @@
     "_string": "加载中50%...",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 17.51231527093596,
+    "_actualFontSize": 19.064039408866996,
     "_fontSize": 15,
     "_fontFamily": "Arial",
     "_lineHeight": 20,

+ 2 - 1
assets/script/framework/sdkUtil.ts

@@ -165,7 +165,8 @@ export class SdkUtil {
             gameManager.hideWaitView();
         });
         SdkUtil.videoAd.onError((res) => {
-            call_back({isEnded:false})
+            let errorString = res.errCode + '-' + res.errMsg
+            call_back({isEnded:false,errorString:errorString})
             SdkUtil.videoAd.destroy()
             gameManager.hideWaitView();
         });

+ 9 - 2
assets/script/framework/statisticsManager.ts

@@ -29,7 +29,7 @@ export class StatisticsManager extends Component {
      * @returns
      * @memberof StatisticsManager
      */
-    public static get_collect_data(category_id: number, level_id: number, coin_number: number, success_status:boolean, actionType: number): statistics_collect_rewardVideo_data_item {
+    public static get_collect_data(category_id: number, level_id: number, coin_number: number, ad_res:any, actionType: number): statistics_collect_rewardVideo_data_item {
         if (actionType == config.STATISTICS_ACTION_TYPE.UNKNOWN) {
             log('统计失败 - 未设置统计类型')
             return
@@ -43,7 +43,14 @@ export class StatisticsManager extends Component {
             collect_data.level_number = gameManager.get_cur_level_by_categoryid(category_id).level
         }
         collect_data.coin = gameManager.userInfo.coin + coin_number
-        collect_data.ads_status = success_status ? 1 : 0
+        collect_data.ads_status = ad_res.isEnded ? 1 : 0
+        if(ad_res.isEnded==false) {
+            if(ad_res.errorString==undefined||ad_res.errorString==null) {
+                collect_data.ads_remarks = '未观看完视频广告'
+            } else {
+                collect_data.ads_remarks = ad_res.errorString
+            }
+        }
         collect_data.ads_action = actionType
         return collect_data
     }

+ 2 - 2
assets/script/homepage/homepage.ts

@@ -67,7 +67,7 @@ export class homepage extends Component {
                     this.showLookVideoReward();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
+                let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -182,7 +182,7 @@ export class homepage extends Component {
                 
                     }
                     // 统计-激励视频广告
-                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
+                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                 })
             });

+ 2 - 2
assets/script/homepage/play_list_item.ts

@@ -98,7 +98,7 @@ export class play_list_item extends Component {
                     }
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.m_data.id, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.JIE_SUO)
+                let collect_data = StatisticsManager.get_collect_data(this.m_data.id, 0, 0, res, config.STATISTICS_ACTION_TYPE.JIE_SUO)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -116,7 +116,7 @@ export class play_list_item extends Component {
                         ClientEvent.dispatchEvent(config.EVENT_MSG.ON_SHOW_REWARD_VIEW)
                     }
                     // 统计-激励视频广告
-                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
+                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                 })
             });

+ 4 - 4
assets/script/play_list/base_view.ts

@@ -63,7 +63,7 @@ export class base_view extends Component {
                 }
 
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -279,7 +279,7 @@ export class base_view extends Component {
 
                     // 统计-激励视频广告
                     let coin_number = res.isEnded ? reward : 0
-                    let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, coin_number, res.isEnded, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
+                    let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, coin_number, res, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                    
                 })
@@ -321,7 +321,7 @@ export class base_view extends Component {
 
             // 统计-激励视频广告
             let coin_number = res.isEnded ? reward : 0
-            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, coin_number, res.isEnded, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
+            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, coin_number, res, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
             StatisticsManager.request_collect_rewardVideoData(collect_data)
         })
     }
@@ -336,7 +336,7 @@ export class base_view extends Component {
             }
 
             // 统计-激励视频广告
-            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.YAN_CHANG)
+            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.YAN_CHANG)
             StatisticsManager.request_collect_rewardVideoData(collect_data)
         })
        

+ 1 - 1
assets/script/play_list/ddz/game_play_dou_di_zhu.ts

@@ -571,7 +571,7 @@ export class game_play_dou_di_zhu extends base_view {
                     fail_view.close()
                 }
                  // 广告视频统计
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

+ 1 - 1
assets/script/play_list/ji_yi_li/view_game_play_ji_yi_li.ts

@@ -82,7 +82,7 @@ export class view_game_play_ji_yi_li extends base_view {
                 fail_view.close()
             }
             // 统计-激励视频广告
-            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
             StatisticsManager.request_collect_rewardVideoData(collect_data)
         })
     }else{

+ 2 - 2
assets/script/play_list/zhao_bu_tong/view_game_play_zhao_bu_tong.ts

@@ -152,7 +152,7 @@ export class view_game_play_zhao_bu_tong extends base_view {
                     tip_call();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.TI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -169,7 +169,7 @@ export class view_game_play_zhao_bu_tong extends base_view {
                     fail_view.close()
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

+ 2 - 2
assets/script/play_list/zhaocha_component/view_game_play_mei_nv_zhao_xi_jie.ts

@@ -69,7 +69,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends base_view {
                     tip_call();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -277,7 +277,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends base_view {
                     fail_view.close()
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

+ 2 - 2
assets/script/play_list/zhaocha_font/view_game_play_han_zi_zhao_bu_tong.ts

@@ -101,7 +101,7 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
                     tip_call();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -281,7 +281,7 @@ export class view_game_play_han_zi_zhao_bu_tong extends base_view {
                     fail_view.close()
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

+ 2 - 2
assets/script/play_list/zhaocha_up_down/view_game_play_shuang_tu_zhao_bu_tong.ts

@@ -129,7 +129,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends base_view {
                     tip_call();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -283,7 +283,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends base_view {
                     fail_view.close()
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

+ 2 - 2
assets/script/play_list/zhaocha_xiang_tong/view_game_play_shuang_tu_zhao_xiang_tong.ts

@@ -86,7 +86,7 @@ export class view_game_play_shuang_tu_zhao_xiang_tong extends  base_view  {
                     tip_call();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -244,7 +244,7 @@ export class view_game_play_shuang_tu_zhao_xiang_tong extends  base_view  {
                     fail_view.close()
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{