456

assets/script/manager/userDataManager.ts

@@ -58,6 +58,7 @@ export class userDataManager  {
         // console.log('old_time=',old_time)
         if(old_time<=0) {
             free_ads_data.is_free = false
+            free_ads_data.is_look_video_infinite_count_reward = false
             return old_time
         }
         

assets/script/ui/home/home.ts

@@ -59,8 +59,8 @@ export class home extends Component {
     private everyTenMinutesUpdate() {
         this.unscheduleAllCallbacks()
         this.schedule(()=>{
-            this.bottom.getComponent(home_bottom).reloadCountryRankData()
-            this.top.getComponent(home_top).reloadGuangboData()
+            this.bottom.getComponent(home_bottom).requestCountryRankData()
+            this.top.getComponent(home_top).requestGuangboData()
         },600)
     }
 }

assets/script/ui/home/home_bottom.ts

@@ -11,6 +11,8 @@ import { unLock_view } from '../unLock_view';
 import { userDataManager } from '../../manager/userDataManager';
 import { home_tt_sidebar } from './home_tt_sidebar';
 import { SdkUtil } from '../../sdkUtil';
+import { ClientEvent } from '../../lib/clientEvent';
+import { rank } from '../rank/rank';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_bottom')
@@ -33,7 +35,10 @@ export class home_bottom extends Component {
         })
         uiManager.Instance().onButtonListen(this.btn_gengduo, ()=>{
             this.node.parent.active = false
-            uiManager.Instance().showUi(config.UI.rank, null, ()=>{
+            uiManager.Instance().showUi(config.UI.rank, null, (node:Node)=>{
+                node.getComponent(rank).onReloadCountryDataCallback((d_content)=>{
+                    this.reloadCountryRankData(d_content)
+                })
                 this.node.parent.active = true
             })
         })
@@ -56,7 +61,7 @@ export class home_bottom extends Component {
         this.reloadWeekScore()
         this.reloadHonorData()
         this.reloadCountdown()
-        this.reloadCountryRankData()
+        this.requestCountryRankData()
         this.reloadTTSidebar()
     }
 
@@ -74,23 +79,27 @@ export class home_bottom extends Component {
         })
     }
     
-    public reloadCountryRankData(){
+    public requestCountryRankData(){
         GameManager.requestRankList(0, (d_content)=>{
-            if(d_content.length>0) {
-                let rank_data = d_content[0]
-                this.rank1_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
-            }
-            if(d_content.length>1) {
-                let rank_data = d_content[1]
-                this.rank2_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
-            }
-            if(d_content.length>2) {
-                let rank_data = d_content[2]
-                this.rank3_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
-            }
+            this.reloadCountryRankData(d_content)
         })
     }
 
+    private reloadCountryRankData(d_content) {
+        if(d_content.length>0) {
+            let rank_data = d_content[0]
+            this.rank1_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
+        }
+        if(d_content.length>1) {
+            let rank_data = d_content[1]
+            this.rank2_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
+        }
+        if(d_content.length>2) {
+            let rank_data = d_content[2]
+            this.rank3_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
+        }
+    }
+
     private onClickRankGotoUserInfo(item:home_bottom_rank_item) {
         let data = item.getData()
         if(data == null) {

assets/script/ui/home/home_top.ts

@@ -39,10 +39,10 @@ export class home_top extends Component {
         })
         this.lab_nickname.getComponent(Label).string = user_data.nickName
         this.lab_car_pai.getComponent(Label).string = user_data.license_code
-        this.reloadGuangboData()
+        this.requestGuangboData()
     }
 
-    public reloadGuangboData() {
+    public requestGuangboData() {
         GameManager.requestGuangbo((d_content)=>{
             this.guangbo.getComponent(home_guangbo).init(d_content)
         })

assets/script/ui/rank/rank.ts

@@ -5,6 +5,8 @@ import { rank_my_info } from './rank_my_info';
 import { rank_list_top } from './rank_list_top';
 import { userDataManager } from '../../manager/userDataManager';
 import { GameManager } from '../../GameManager';
+import { ClientEvent } from '../../lib/clientEvent';
+import { config } from '../../config';
 const { ccclass, property } = _decorator;
 
 @ccclass('rank')
@@ -26,6 +28,12 @@ export class rank extends Component {
     @property(SpriteFrame) sf_city_selected:SpriteFrame = null;
     @property(SpriteFrame) sf_city_unselected:SpriteFrame = null;
 
+    private m_onReloadCountryDataCallback = null;
+
+    onReloadCountryDataCallback(cb) {
+        this.m_onReloadCountryDataCallback = cb
+    }
+
     start() {
         uiManager.Instance().onButtonListen(this.btn_back, ()=>{
             this.close()
@@ -75,6 +83,11 @@ export class rank extends Component {
         }
         GameManager.requestRankList(id,(d_content)=>{
             // console.log('排行列表 id=',id, '数据=',d_content)
+            if(id==0) {
+                if(this.m_onReloadCountryDataCallback!=null) {
+                    this.m_onReloadCountryDataCallback(d_content)
+                }
+            }
             this.reloadListTop(d_content)
             this.reloadListContent(d_content)
             this.reloadMyInfo(type)