future 1 gadu atpakaļ
vecāks
revīzija
26680132fc

+ 3 - 3
assets/resources/ui/home.prefab

@@ -4892,7 +4892,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 61.536,
+      "y": 59.536,
       "z": 0
     },
     "_lrot": {
@@ -4904,8 +4904,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.25,
+      "x": 0.26,
+      "y": 0.26,
       "z": 1
     },
     "_mobility": 0,

+ 9 - 0
assets/script/GameManager.ts

@@ -32,6 +32,15 @@ export class GameManager extends Component {
         let sf = imageCacheManager.getRankCarImageById(userDataManager.user_car_list.default_car_id)
         return sf
     }
+
+    // 获取用户排行车sf
+    public static getUserRankCarSf(user_id:number, car_id:number):SpriteFrame {
+        if(userDataManager.user_data.id == user_id) {
+            return GameManager.getUserDefaultRankCarSf()
+        } else {
+            return imageCacheManager.getRankCarImageById(car_id)
+        }
+    }
     
     // 检查玩游戏
     public static checkPlayGame(parent_node:Node,play_cb) {

+ 15 - 6
assets/script/ui/car_lib/car_lib.ts

@@ -14,9 +14,12 @@ export class car_lib extends base_ui {
     @property(Node) btn_back:Node = null
     @property(Node) top_node:Node = null
     @property(Node) bottom_node:Node = null
+
+    private m_cur_car:car_lib_list_item = null
     
     start() {
         this.onButtonListen(this.btn_back, ()=>{
+            this.syncUserSetDefaultCar()
             this.close()
         })
 
@@ -29,14 +32,20 @@ export class car_lib extends base_ui {
     }
 
     private onClickListItem(item:car_lib_list_item) {
-        let opt = {'car_id': item.getData().id}
+        this.m_cur_car = item
+        userDataManager.user_car_list.default_car_id = item.getData().id
+        this.top_node.getComponent(car_lib_top).reloadUserCar()
+        ClientEvent.dispatchEvent(config.UI_EVENT.UPDATE_USER_DEFAULT_CAR)
+    }
+
+    private syncUserSetDefaultCar() {
+        if(this.m_cur_car==null) {
+            return
+        }
+        let opt = {'car_id': this.m_cur_car.getData().id}
         http.post(config.API.user_set_default_car_id, opt, (err,d)=>{
             let nd = JSON.parse(d)
-            if(nd.code === config.status.SUCCESS){
-                userDataManager.user_car_list.default_car_id = item.getData().id
-                this.top_node.getComponent(car_lib_top).reloadUserCar()
-                ClientEvent.dispatchEvent(config.UI_EVENT.UPDATE_USER_DEFAULT_CAR)
-            }  
+            if(nd.code === config.status.SUCCESS){}  
         })
     }
 }

+ 2 - 0
assets/script/ui/home/home.ts

@@ -55,6 +55,8 @@ export class home extends Component {
 
     onUpdateUserDefaultCar() {
         this.home_car.getComponent(home_car).updateCar()
+        // 刷新排行
+        this.bottom.getComponent(home_bottom).checkIsMineCountryRank()
     }
 
     onMsgGuangboRank(msg) {

+ 29 - 5
assets/script/ui/home/home_bottom.ts

@@ -29,6 +29,8 @@ export class home_bottom extends Component {
     @property(Node) countdown_node:Node = null
     @property(Node) tt_btn_gift:Node = null
     @property(Node) tt_sidebar:Node = null
+    private m_d_content = null
+    private rank_item_list:home_bottom_rank_item[] = []
 
     start() {
         uiManager.Instance().onButtonListen(this.btn_wenhao, ()=>{
@@ -54,8 +56,12 @@ export class home_bottom extends Component {
             })
         })
         uiManager.Instance().onButtonListen(this.tt_btn_gift, ()=>{
-            this.onClickTTLihe()
+            this.onClickTTGift()
         })
+
+        this.rank_item_list.push(this.rank1_node.getComponent(home_bottom_rank_item))
+        this.rank_item_list.push(this.rank2_node.getComponent(home_bottom_rank_item))
+        this.rank_item_list.push(this.rank3_node.getComponent(home_bottom_rank_item))
     }
 
     public init() {
@@ -92,18 +98,36 @@ export class home_bottom extends Component {
     }
 
     public reloadCountryRankData(d_content) {
+        this.m_d_content = 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))
+            this.loadRankItemData(0,rank_data)
         }
         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))
+            this.loadRankItemData(1,rank_data)
         }
         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.loadRankItemData(2,rank_data)
+        }
+    }
+
+    public checkIsMineCountryRank() {
+        if(this.m_d_content==undefined||this.m_d_content==null) {
+            return
         }
+        for (let index = 0; index < this.m_d_content.length; index++) {
+            const element = this.m_d_content[index]
+            if(element.user_id==userDataManager.user_data.id) {
+                this.loadRankItemData(index,element)
+                break
+            }
+        }
+    }
+
+    private loadRankItemData(index:number, rank_data) {
+        this.rank_item_list[index].initView(rank_data, this.onClickRankGotoUserInfo.bind(this))
     }
 
     private onClickRankGotoUserInfo(item:home_bottom_rank_item) {
@@ -125,7 +149,7 @@ export class home_bottom extends Component {
         this.tt_btn_gift.getComponent(Animation).play()
     }
 
-    private onClickTTLihe() {
+    private onClickTTGift() {
         let isToEnterFromSidebar = SdkUtil.ttCheckToEnterFromSidebar()
         this.tt_sidebar.getComponent(home_tt_sidebar).show(isToEnterFromSidebar, (r:home_tt_sidebar)=>{
             SdkUtil.ttNavToSidebarScene()

+ 3 - 1
assets/script/ui/home/home_bottom_rank_item.ts

@@ -2,6 +2,8 @@ import { _decorator, Component, Label, Node, Sprite } from 'cc';
 import { uiManager } from '../../manager/uiManager';
 import { rankData } from '../../data';
 import { imageCacheManager } from '../../manager/imageCacheManager';
+import { userDataManager } from '../../manager/userDataManager';
+import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_bottom_rank_item')
@@ -22,7 +24,7 @@ export class home_bottom_rank_item extends Component {
     public initView(data:rankData, cb) {
         this.m_data = data
         this.m_cb = cb
-        this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
         let lab_component = this.lab_nickname.getComponent(Label)
         if(data.nickName.length>5) {
             lab_component.string = data.nickName.substring(0,5) + '...'

+ 1 - 5
assets/script/ui/rank/rank_list_item.ts

@@ -35,11 +35,7 @@ export class rank_list_item extends base_ui {
         })
         this.lab_nickname.getComponent(Label).string = data.nickName
         this.lab_score.getComponent(Label).string = data.score + ' 分'
-        if(data.user_id==userDataManager.user_data.id) {
-            this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserDefaultRankCarSf()
-        } else {
-            this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
-        }
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
     }
 }
 

+ 1 - 5
assets/script/ui/rank/rank_list_top.ts

@@ -110,11 +110,7 @@ export class rank_list_top extends base_ui {
     }
 
     private setImgCar(node:Node, data:rankData) {
-        if(data.user_id==userDataManager.user_data.id) {
-            node.getComponent(Sprite).spriteFrame = GameManager.getUserDefaultRankCarSf()
-        } else {
-            node.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
-        }
+        node.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
     }
 
     private onClickRankGotoUserInfo(data:rankData) {