456

assets/script/config.ts

@@ -115,7 +115,7 @@ export class config  {
     public static UI_EVENT ={
         GET_NEW_CAR:"get_new_car",
         UPDATE_USER_DEFAULT_CAR:"update_user_default_car",
-        UPDATE_USER_REGION:"update_user_region",
+        GAME_OVER_SETTLE_ACCOUNT:"game_over_settle_account",
     }
 
     public static ADS_CONFIG = {

assets/script/data.ts

@@ -87,6 +87,7 @@ export class user_results{
     public default_car_id:number = 0 //	默认车辆
     public obtain_list:number[] = [] //
     public ratio:string = ""
+    public max_integral:number = 0
 }
 
 export class sysConfig{

assets/script/game/results.ts

@@ -76,6 +76,7 @@ export class results extends Component {
                         ClientEvent.dispatchEvent(config.UI_EVENT.GET_NEW_CAR,res)
                     }
                     this.lab_des.getComponent(Label).string=`已超过全国${res.ratio}的司机`
+                    ClientEvent.dispatchEvent(config.UI_EVENT.GAME_OVER_SETTLE_ACCOUNT,res)
                 }
                 // http.get(config.STATIC_API.regions,(e,d)=>{
                 //     console.log("regions",d)

assets/script/ui/car_lib/car_lib_top.ts

@@ -3,10 +3,9 @@ import { userDataManager } from '../../manager/userDataManager';
 import { tools } from '../../tools';
 import { GameManager } from '../../GameManager';
 import { select_area } from '../select_area/select_area';
-import { area_item_data, userData } from '../../data';
+import { area_item_data } from '../../data';
 import { uiManager } from '../../manager/uiManager';
 import { config } from '../../config';
-import { ClientEvent } from '../../lib/clientEvent';
 const { ccclass, property } = _decorator;
 
 @ccclass('car_lib_top')
@@ -40,8 +39,8 @@ export class car_lib_top extends Component {
         } else {
             this.lab_nickname.getComponent(Label).string = user_data.nickName
         }
-        this.reloadUserRegion()
         this.lab_car_pai.getComponent(Label).string = user_data.license_code
+        this.lab_region.getComponent(Label).string = user_data.province_name + ' - ' + user_data.city_name
         this.reloadUserCar()
     }
 
@@ -49,23 +48,10 @@ export class car_lib_top extends Component {
         this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserDefaultCarSf()
     }
 
-    reloadUserRegion(){
-        let user_data = userDataManager.user_data
-        this.lab_region.getComponent(Label).string = user_data.province_name + ' - ' + user_data.city_name
-    }
-
     private onSelectArea(obj:select_area, data:area_item_data) {
         GameManager.requestUserSetRegion(data.id, 2, (d)=>{
             //更改数据
-            let user_data = userDataManager.user_data
-            user_data.region_id = d.region_id
-            user_data.region_pid = d.region_pid
-            user_data.province_name = obj.province_selected_data.name
-            user_data.city_name = obj.city_selected_data.name
-            user_data.update_region_status = d.update_region_status
-            this.reloadUserRegion()
-            //发送通知
-            ClientEvent.dispatchEvent(config.UI_EVENT.UPDATE_USER_REGION)
+            userDataManager.user_data.update_region_status = d.update_region_status
             //关闭
             obj.closeSelf()
         })

assets/script/ui/home/home.ts

@@ -28,26 +28,29 @@ export class home extends Component {
         })
         ClientEvent.on(config.UI_EVENT.GET_NEW_CAR,this.onGetNewCar.bind(this),this)
         ClientEvent.on(config.UI_EVENT.UPDATE_USER_DEFAULT_CAR,this.onUpdateUserDefaultCar.bind(this),this)
-        ClientEvent.on(config.UI_EVENT.UPDATE_USER_REGION,this.onUpdateUserRegion.bind(this),this)
+        ClientEvent.on(config.UI_EVENT.GAME_OVER_SETTLE_ACCOUNT,this.onGameOverSettleAccount.bind(this),this)
+    }
+
+    onGameOverSettleAccount(res:user_results){
+        // 更新本周分数
+        tools.mine_rank_data.score = res.max_integral
+        this.bottom.getComponent(home_bottom).reloadWeekScore()
     }
 
     onGetNewCar(res:user_results){
+        // 更新默认车
         userDataManager.user_car_list.default_car_id = res.default_car_id
-        console.log("获取新车:",dataManager.getCarInfoById(userDataManager.user_car_list.default_car_id))
-        //TODO
-        //1.向服务端同步当前玩家使用最新的车
-        //2.并查看解锁了哪些车辆，进行相关处理
-        GameManager.getUserCarList()
+        // console.log("获取新车:",dataManager.getCarInfoById(userDataManager.user_car_list.default_car_id))
+        // 更新用户解锁车列表
+        userDataManager.user_car_list.car_list = res.unlock_car_list
+        // 更新首页车
+        this.home_car.getComponent(home_car).updateCar()
     }
 
     onUpdateUserDefaultCar() {
         this.home_car.getComponent(home_car).updateCar()
     }
 
-    onUpdateUserRegion() {
-        this.top.getComponent(home_top).reloadUserRegion()
-    }
-
     public init(){
         this.top.getComponent(home_top).init()
         this.home_car.getComponent(home_car).updateCar()

assets/script/ui/home/home_bottom.ts

@@ -47,12 +47,16 @@ export class home_bottom extends Component {
     }
 
     public init() {
-        this.lab_week_score.getComponent(Label).string = tools.mine_rank_data.score + ''
+        this.reloadWeekScore()
         this.reloadHonorData()
         this.reloadCountdown()
         this.reloadCountryRankData()
     }
 
+    public reloadWeekScore() {
+        this.lab_week_score.getComponent(Label).string = tools.mine_rank_data.score + ''
+    }
+
     private reloadHonorData() {
         this.img_honor.getComponent(home_honor).initView()
     }

assets/script/ui/home/home_car.ts

@@ -7,7 +7,7 @@ const { ccclass, property } = _decorator;
 export class home_car extends Component {
     @property(Node) spr_car:Node = null
     updateCar(){
-        console.log('car_id=',userDataManager.user_car_list.default_car_id)
+        // console.log('当前用户默认car_id=',userDataManager.user_car_list.default_car_id)
         this.spr_car.getComponent(Sprite).spriteFrame = GameManager.getUserDefaultCarSf()
     }
 }

assets/script/ui/home/home_top.ts

@@ -40,11 +40,7 @@ export class home_top extends Component {
         this.lab_car_pai.getComponent(Label).string = user_data.license_code
         this.guangbo.getComponent(home_guangbo).init()
     }
-
-    public reloadUserRegion() {
-        let user_data = userDataManager.user_data
-        this.lab_region.getComponent(Label).string = user_data.province_name + ' - ' + user_data.city_name
-    }
+    
 }
 
 

assets/script/ui/loading_view.ts

@@ -136,8 +136,8 @@ export class loading_view extends Component {
                     }
                 })
             }else{
-                cb("_000X63WYAUFPNibogS0zqhdA64n4_5TBhXM")
-                // cb("456")
+                // cb("_000X63WYAUFPNibogS0zqhdA64n4_5TBhXM")
+                cb("456")
             }
         })
     }
@@ -145,11 +145,12 @@ export class loading_view extends Component {
     private setUserSelectArea() {
         uiManager.Instance().showUi(config.UI.ui_select_area, this.node, (node:Node)=>{
             node.getComponent(select_area).initView(false, (obj:select_area, data:area_item_data)=>{
-                GameManager.requestUserSetRegion(data.id, 1, (d)=>{
-                    userDataManager.user_data.region_id = d.region_id
-                    userDataManager.user_data.region_pid = d.region_pid
-                    userDataManager.user_data.province_name = d.province_name
-                    userDataManager.user_data.city_name = d.city_name
+                GameManager.requestUserSetRegion(data.id, 1, (d_content)=>{
+                    userDataManager.user_data.region_id = d_content.region_id
+                    userDataManager.user_data.region_pid = d_content.region_pid
+                    userDataManager.user_data.province_name = d_content.province_name
+                    userDataManager.user_data.city_name = d_content.city_name
+                    userDataManager.user_data.license_code = d_content.license_code
                     this.m_pause_status = false
                     obj.closeSelf()
                 })