future 1 рік тому
батько
коміт
1d9cda70e2

Різницю між файлами не показано, бо вона завелика
+ 103 - 1049
assets/resources/ui/car_lib.prefab


+ 15 - 342
assets/resources/ui/car_lib_list_item.prefab

@@ -34,17 +34,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 34
       },
       {
-        "__id__": 48
+        "__id__": 36
       },
       {
-        "__id__": 50
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -537,28 +537,22 @@
     "_children": [
       {
         "__id__": 21
-      },
-      {
-        "__id__": 27
-      },
-      {
-        "__id__": 33
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 27
       },
       {
-        "__id__": 41
+        "__id__": 29
       },
       {
-        "__id__": 43
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -613,7 +607,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 64,
+      "y": 20,
       "z": 0
     },
     "_lrot": {
@@ -725,324 +719,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "lab_suo_score",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 20
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 28
-      },
-      {
-        "__id__": 30
-      }
-    ],
-    "_prefab": {
-      "__id__": 32
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -41,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 29
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 400,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "58U2bNG0FCJ7ZKklZmnf+b"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 31
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 215,
-      "g": 244,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 45,
-    "_fontSize": 45,
-    "_fontFamily": "Arial",
-    "_lineHeight": 50,
-    "_overflow": 2,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e19kHgX95KgLP/cURxxhBP"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "6azeC9S2RAhL/55QevvpUQ",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lab_jiesuo",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 20
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 34
-      },
-      {
-        "__id__": 36
-      }
-    ],
-    "_prefab": {
-      "__id__": 38
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -2.25,
-      "y": -104,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 33
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 35
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 80,
-      "height": 63
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "80lRBpJBlFwLisSuqJuKXK"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 33
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 37
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 215,
-      "g": 244,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "解锁",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
-    "_fontFamily": "Arial",
-    "_lineHeight": 50,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "cemHtWchxOxbcMxIlObCAf"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "72Rbg3+9hIAYEZmZf3y2ML",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1053,7 +729,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1081,7 +757,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 30
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1117,7 +793,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 32
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1175,7 +851,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 35
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1203,7 +879,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 37
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1248,7 +924,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 39
     },
     "sf_bg_select": {
       "__uuid__": "3a64131b-63dc-4fd3-88ec-2bd86ca51cf8@f9941",
@@ -1270,9 +946,6 @@
     "suo_node": {
       "__id__": 20
     },
-    "lab_suo_score": {
-      "__id__": 27
-    },
     "_id": ""
   },
   {

+ 0 - 6
assets/script/ui/car_lib/car_lib_bottom.ts

@@ -2,8 +2,6 @@ import { _decorator, Color, Component, instantiate, Label, Layout, Node, PageVie
 import { base_ui } from '../../fw/base_ui';
 import { tools } from '../../tools';
 import { car_lib_list_item } from './car_lib_list_item';
-import { userDataManager } from '../../manager/userDataManager';
-import { car_item_data } from '../../data';
 import { car_lib_page_item } from './car_lib_page_item';
 const { ccclass, property } = _decorator;
 
@@ -12,10 +10,6 @@ export class car_lib_bottom extends base_ui {
     @property(Node) btn_num_left:Node = null
     @property(Node) btn_num_right:Node = null
     @property(Node) lab_num:Node = null
-    @property(Node) list:Node = null
-    @property(Node) list_content:Node = null
-    @property(Prefab) list_item:Prefab = null
-
     @property(Node) pageView:Node = null
     @property(Node) pageView_content:Node = null
     @property(Prefab) pageView_page_item:Prefab = null

+ 0 - 2
assets/script/ui/car_lib/car_lib_list_item.ts

@@ -13,7 +13,6 @@ export class car_lib_list_item extends Component {
     @property(Node) lab_car_name:Node = null
     @property(Node) lab_car_score:Node = null
     @property(Node) suo_node:Node = null
-    @property(Node) lab_suo_score:Node = null
     private m_data:car_item_data = null
     private m_index:number = 0
     private m_cb = null
@@ -33,7 +32,6 @@ export class car_lib_list_item extends Component {
         this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.id)
         this.lab_car_name.getComponent(Label).string = imageCacheManager.getCarNameById(data.id) //data.name
         this.lab_car_score.getComponent(Label).string = data.unlock_points + '分'
-        this.lab_suo_score.getComponent(Label).string = data.unlock_points + '分'
     }
 
     public getData():car_item_data{

Деякі файли не було показано, через те що забагато файлів було змінено