456

assets/script/ui/car_lib/car_lib_bottom.ts

@@ -6,7 +6,7 @@ import { car_lib_page_item } from './car_lib_page_item';
 import { uiManager } from '../../manager/uiManager';
 import { config } from '../../config';
 import { GameManager } from '../../GameManager';
-import { bag_type } from '../../data';
+import { bag_type, car_type } from '../../data';
 import { car_info } from '../car_info/car_info';
 import { SdkUtil } from '../../sdkUtil';
 const { ccclass, property } = _decorator;
@@ -91,13 +91,15 @@ export class car_lib_bottom extends base_ui {
 
     private onClickListItem(page_item:car_lib_page_item,list_item:car_lib_list_item) {
         let car_item_data = list_item.getData()
-        let cur_count = car_item_data.temp_bag_list_item_data.quantity
-        if(cur_count-car_item_data.unlock_points>=0) {
-            // 直接显示兑换车辆视图
-            GameManager.showExchangeCarView(car_item_data.id,car_item_data.temp_bag_list_item_data.icon,car_item_data.temp_bag_list_item_data.quantity, ()=>{
-                list_item.setJiesuoSelectedStatus()
-            })
-            return
+        if(list_item.getIsJiesuo()==false&&car_item_data.stype==car_type.suipian) {
+            let cur_count = car_item_data.temp_bag_list_item_data.quantity
+            if(cur_count-car_item_data.unlock_points>=0) {
+                // 直接显示兑换车辆视图
+                GameManager.showExchangeCarView(car_item_data.id,car_item_data.temp_bag_list_item_data.icon,car_item_data.temp_bag_list_item_data.quantity, ()=>{
+                    list_item.setJiesuoSelectedStatus()
+                })
+                return
+            }
         }
         uiManager.Instance().showUi(config.UI.ui_car_info,this.game_status_parent!=null?this.game_status_parent:null, (node:Node)=>{
             let car_info_component = node.getComponent(car_info)

assets/script/ui/rank/rank_list_item.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Label, Node, Sprite, SpriteFrame, UITransform } from 'cc';
+import { _decorator, Component, Label, Node, Sprite, SpriteFrame, UITransform, Vec3 } from 'cc';
 import { quarter_rank_item_data, rankData } from '../../data';
 import { tools } from '../../tools';
 import { uiManager } from '../../manager/uiManager';
@@ -78,6 +78,10 @@ export class rank_list_item extends base_ui {
             this.lab_number.active = true
         }
         this.lab_number.getComponent(Label).string = index+1 + ''
+        let car_scale = this.img_car.scale
+        let scale_x = car_scale.x
+        if(scale_x<0) { scale_x = -scale_x }
+        this.img_car.setScale(new Vec3(scale_x,car_scale.y,car_scale.z))
         tools.loadRemoteImg(data.avatarUrl, (r)=>{
             this.img_avatar.getComponent(Sprite).spriteFrame = r.sf
         })

assets/script/ui/rank/rank_my_info.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Label, Node, Sprite, SpriteFrame } from 'cc';
+import { _decorator, Component, Label, Node, Sprite, SpriteFrame, Vec3 } from 'cc';
 import { quarter_rank_item_data, rankData } from '../../data';
 import { tools } from '../../tools';
 import { dataManager } from '../../manager/dataManager';
@@ -32,6 +32,10 @@ export class rank_my_info extends Component {
     initQuarterRank(data:rankData, quarter_rank_data:quarter_rank_item_data) {
         this.setBasiData(data)
         if(quarter_rank_data) {
+            let car_scale = this.img_car.scale
+            let scale_x = car_scale.x
+            if(scale_x<0) { scale_x = -scale_x }
+            this.img_car.setScale(new Vec3(scale_x,car_scale.y,car_scale.z))
             tools.loadRemoteImg(quarter_rank_data.icon, (r)=>{
                 this.img_car.getComponent(Sprite).spriteFrame = r.sf
             })