456

assets/script/GameManager.ts

@@ -1,6 +1,6 @@
 import { _decorator, Component, Node, SpriteFrame, sys } from 'cc';
 import { config } from './config';
-import { settingData } from './data';
+import { car_item_attribute_data, car_item_data, settingData } from './data';
 import { http } from './http';
 import { imageCacheManager } from './manager/imageCacheManager';
 import { userDataManager } from './manager/userDataManager';
@@ -58,10 +58,12 @@ export class GameManager extends Component {
     }
 
     // 获取用户车信息
-    public static getUserCarInfo(user_id:number, car_id:number) {
-        let sf:SpriteFrame = this.getUserRankCarSf(user_id, car_id)
-        let name:string = imageCacheManager.getCarNameById(car_id)
-        return {'sf':sf,'name':name}
+    public static getUserCarInfo(car_id:number):car_item_data {
+        let car_item:car_item_data = tools.all_car_map.get(car_id)
+        if(car_item.attribute==undefined||car_item.attribute==null) {
+            car_item.attribute = new car_item_attribute_data()
+        }
+        return car_item
     }
     
     // 检查玩游戏

assets/script/config.ts

@@ -3,7 +3,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass('config')
 export class config  {
-    static debug = false
+    static debug = true
     static gameName = "开局自行车";
     static websocket_domain = config.debug?'wss://snakews.xwrun.com':"wss://snakews.hainanmlwl.com" 
     public static Platform_id = {

assets/script/data.ts

@@ -129,6 +129,7 @@ export class car_item_data{
     public cover:string = "";
     public home_cover:string = "";
     public ranking_cover:string = "";
+    public stype:number = 0  // 0:积分车 1:兑换
     public attribute:car_item_attribute_data = new car_item_attribute_data() //属性
 }
 

assets/script/manager/imageCacheManager.ts

@@ -15,7 +15,6 @@ export class imageCacheManager  {
     private static game_car_map:Map<number,SpriteFrame> = new Map
     private static home_car_map:Map<number,SpriteFrame> = new Map
     private static rank_car_map:Map<number,SpriteFrame> = new Map
-    private static car_name_map:Map<number,string> = new Map
     
     public static start_cache(cb){
         let game_car_list:img_data[]=[]
@@ -31,11 +30,12 @@ export class imageCacheManager  {
         }
         for (let index = 0; index < tools.all_car_list.length; index++) {
             const element = tools.all_car_list[index];
+            tools.all_car_map.set(element.id,element)
             game_car_list.push(new img_data(element.id,element.cover))
             home_car_list.push(new img_data(element.id,element.home_cover))
             rank_car_list.push(new img_data(element.id,element.ranking_cover))
-            imageCacheManager.car_name_map.set(element.id, element.name)
         }
+        // console.log('tools.all_car_map=', tools.all_car_map)
         imageCacheManager.cache_game_car(game_car_list,call_back)
         imageCacheManager.cache_home_car(home_car_list,call_back)
         imageCacheManager.cache_rank_car(rank_car_list,call_back)
@@ -95,10 +95,7 @@ export class imageCacheManager  {
     public static getGameCarImageById(id:number){
         return imageCacheManager.game_car_map.get(id)
     }
-
-    public static getCarNameById(id:number) {
-        return imageCacheManager.car_name_map.get(id)
-    }
+    
 }
 
 

assets/script/tools.ts

@@ -13,6 +13,7 @@ export class tools  {
     public static sys_config:sysConfig = null
     public static mine_rank_data:rankData = null
     public static all_car_list:car_item_data[] =[]
+    public static all_car_map:Map<number,car_item_data> = new Map
     public static all_car_page_list = []
     public static init(n:Node){
         tools.parent = n

assets/script/ui/car_lib/car_lib_list_item.ts

@@ -1,8 +1,7 @@
 import { _decorator, Component, Label, Node, Sprite, SpriteFrame } from 'cc';
 import { car_item_data } from '../../data';
 import { uiManager } from '../../manager/uiManager';
-import { userDataManager } from '../../manager/userDataManager';
-import { imageCacheManager } from '../../manager/imageCacheManager';
+import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('car_lib_list_item')
@@ -29,8 +28,8 @@ export class car_lib_list_item extends Component {
         this.m_data = data
         this.m_index = index
         this.m_cb = cb
-        this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.id)
-        this.lab_car_name.getComponent(Label).string = imageCacheManager.getCarNameById(data.id) //data.name
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(-1,data.id)
+        this.lab_car_name.getComponent(Label).string = data.name
         this.lab_car_score.getComponent(Label).string = data.unlock_points + '分'
     }
 

assets/script/ui/home/home_bottom_rank_item.ts

@@ -24,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 = GameManager.getUserCarInfo(data.user_id,data.car_id).sf
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
         tools.labelCutString(this.lab_nickname,data.nickName,5)
         this.lab_score.getComponent(Label).string = data.score + '分'
         this.lab_jiancheng.getComponent(Label).string = data.province_code

assets/script/ui/rank/rank_list_item.ts

@@ -38,7 +38,7 @@ export class rank_list_item extends base_ui {
         tools.substringRankRegionName(this.lab_region, data.city_name)
         tools.labelCutString(this.lab_nickname,data.nickName,8,false) //this.lab_nickname.getComponent(Label).string = data.nickName
         this.lab_score.getComponent(Label).string = data.score + ' 分'
-        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserCarInfo(data.user_id,data.car_id).sf
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
     }
 }
 

assets/script/ui/rank/rank_list_top.ts

@@ -113,7 +113,7 @@ export class rank_list_top extends base_ui {
     }
 
     private setImgCar(node:Node, data:rankData) {
-        node.getComponent(Sprite).spriteFrame = GameManager.getUserCarInfo(data.user_id,data.car_id).sf
+        node.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id,data.car_id)
     }
 
     private setRegion(bg_node:Node, node:Node, data:rankData, type:number) {

assets/script/ui/user_info_view.ts

@@ -51,10 +51,10 @@ export class user_info_view extends base_ui {
         })
         this.lab_region.getComponent(Label).string = data.province_name + ' - ' + data.city_name
         this.lab_nickname.getComponent(Label).string = data.nickName
-        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserCarInfo(data.user_id,data.car_id).sf
+        this.img_car.getComponent(Sprite).spriteFrame = GameManager.getUserRankCarSf(data.user_id, data.car_id)
         this.lab_car_pai.getComponent(Label).string = data.license_code
         this.lab_score.getComponent(Label).string = data.score + '分'
-        this.lab_car_name.getComponent(Label).string = GameManager.getUserCarInfo(data.user_id,data.car_id).name
+        this.lab_car_name.getComponent(Label).string = GameManager.getUserCarInfo(data.car_id).name
     }
 }