future 1 년 전
부모
커밋
048e89a270

+ 10 - 10
assets/scene/game.scene

@@ -110,8 +110,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 187.50000000000003,
-      "y": 405.99999999999994,
+      "x": 187.49999999999997,
+      "y": 406.00000000000006,
       "z": 0
     },
     "_lrot": {
@@ -717,7 +717,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 8.89651150173611,
+      "width": 8.8984375,
       "height": 20.16
     },
     "_anchorPoint": {
@@ -750,7 +750,7 @@
     "_string": "0",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 22.344827586206897,
+    "_actualFontSize": 16,
     "_fontSize": 16,
     "_fontFamily": "Arial",
     "_lineHeight": 16,
@@ -2809,7 +2809,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 87.48974910783178,
+      "width": 87.5244140625,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -2842,7 +2842,7 @@
     "_string": "加载中50%...",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20.948275862068964,
+    "_actualFontSize": 15,
     "_fontSize": 15,
     "_fontFamily": "Arial",
     "_lineHeight": 20,
@@ -3739,10 +3739,10 @@
     "__prefab": null,
     "_alignFlags": 45,
     "_target": null,
-    "_left": 2.842170943040401e-14,
-    "_right": 2.842170943040401e-14,
-    "_top": -5.684341886080802e-14,
-    "_bottom": -5.684341886080802e-14,
+    "_left": -2.842170943040401e-14,
+    "_right": -2.842170943040401e-14,
+    "_top": 5.684341886080802e-14,
+    "_bottom": 5.684341886080802e-14,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

+ 1 - 7
assets/script/config.ts

@@ -185,13 +185,7 @@ export class config {
         COIN: 1,
         LEVELS: 2,
     }
-
-
-    static Watch_rewardVideo_status = {
-        FAIL: 0,
-        SUCCESS: 1,
-    }
-
+    
     static STATISTICS_ACTION_TYPE = {
         UNKNOWN: 0,            //未知
         ZHUAN_JIN_BI: 1,       //赚金币

+ 2 - 1
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, actionType: number): statistics_collect_rewardVideo_data_item {
+    public static get_collect_data(category_id: number, level_id: number, coin_number: number, success_status:boolean, actionType: number): statistics_collect_rewardVideo_data_item {
         if (actionType == config.STATISTICS_ACTION_TYPE.UNKNOWN) {
             log('统计失败 - 未设置统计类型')
             return
@@ -43,6 +43,7 @@ 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_action = actionType
         return collect_data
     }

+ 3 - 6
assets/script/homepage/homepage.ts

@@ -67,8 +67,7 @@ export class homepage extends Component {
                     this.showLookVideoReward();
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(0, 0, 0, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -172,9 +171,8 @@ export class homepage extends Component {
                 SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                     if(res.isEnded){
                         reward = gameManager.get_deouble_reward_number();
-                        gameManager.add_coin(reward)
-
                         tween(self.btn_setting).delay(0.5).call(()=>{
+                            gameManager.add_coin(reward)
                             win_view.showDoubleCoin(reward,()=>{
                                 self.showCoinAni()
                                 win_view.close()
@@ -184,8 +182,7 @@ export class homepage extends Component {
                 
                     }
                     // 统计-激励视频广告
-                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
-                    collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                 })
             });

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

@@ -98,8 +98,7 @@ export class play_list_item extends Component {
                     }
                 }
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.m_data.id, 0, 0, config.STATISTICS_ACTION_TYPE.JIE_SUO)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.m_data.id, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.JIE_SUO)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -117,8 +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, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
-                    collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                    let collect_data = StatisticsManager.get_collect_data(0, 0, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                 })
             });

+ 5 - 10
assets/script/play_list/base_view.ts

@@ -63,8 +63,7 @@ export class base_view extends Component {
                 }
 
                 // 统计-激励视频广告
-                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.ZHUAN_JIN_BI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
@@ -265,9 +264,8 @@ export class base_view extends Component {
                 SdkUtil.showVideoAd(config.rewardVideoAdUnitId.Earn_coins_AdUnitId,(res)=>{
                     if(res.isEnded){
                         reward = gameManager.get_deouble_reward_number();
-                        gameManager.add_coin(reward)
-
                         tween(self.node).delay(0.5).call(()=>{
+                            gameManager.add_coin(reward)
                             win_view.showDoubleCoin(reward,()=>{
                                 self.showCoinAni()
                                 win_view.close()
@@ -281,8 +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, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
-                    collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                    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)
                     StatisticsManager.request_collect_rewardVideoData(collect_data)
                    
                 })
@@ -324,8 +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, config.STATISTICS_ACTION_TYPE.CHAO_JI_JIA_BEI)
-            collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+            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)
             StatisticsManager.request_collect_rewardVideoData(collect_data)
         })
     }
@@ -340,8 +336,7 @@ export class base_view extends Component {
             }
 
             // 统计-激励视频广告
-            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, config.STATISTICS_ACTION_TYPE.YAN_CHANG)
-            collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+            let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.YAN_CHANG)
             StatisticsManager.request_collect_rewardVideoData(collect_data)
         })
        

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

@@ -152,8 +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,config.STATISTICS_ACTION_TYPE.TI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -170,8 +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, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

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

@@ -69,8 +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,config.STATISTICS_ACTION_TYPE.TI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -278,8 +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, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

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

@@ -101,8 +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,config.STATISTICS_ACTION_TYPE.TI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -282,8 +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, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

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

@@ -129,8 +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,config.STATISTICS_ACTION_TYPE.TI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -284,8 +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, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{

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

@@ -86,8 +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,config.STATISTICS_ACTION_TYPE.TI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid,this.m_data.id,0,res.isEnded,config.STATISTICS_ACTION_TYPE.TI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }
@@ -245,8 +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, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
-                collect_data.ads_status = res.isEnded ? config.Watch_rewardVideo_status.SUCCESS : config.Watch_rewardVideo_status.FAIL
+                let collect_data = StatisticsManager.get_collect_data(this.categoryid, this.m_data.id, 0, res.isEnded, config.STATISTICS_ACTION_TYPE.CHONG_XIN_KAI_SHI)
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         }else{