456

assets/resources/ui/car_lib_list_item.prefab

@@ -37,17 +37,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 46
       },
       {
-        "__id__": 54
+        "__id__": 48
       },
       {
-        "__id__": 56
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -985,83 +985,29 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "img_kuang",
+    "_name": "img_id",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 41
-      }
-    ],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 47
-      },
-      {
-        "__id__": 49
-      }
-    ],
-    "_prefab": {
-      "__id__": 51
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 140.837,
-      "y": 101.7650000000001,
-      "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.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 40
-    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 41
       },
       {
-        "__id__": 44
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 9,
+      "x": -215.915,
+      "y": 143.111,
       "z": 0
     },
     "_lrot": {
@@ -1087,115 +1033,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 41
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 43
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 124,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "447/AdBYtC3rwjdRJFzG1f"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 41
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 45
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 180,
-      "g": 228,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "碎片获得",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 31,
-    "_fontSize": 31,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 1,
-    "_enableWrapText": false,
-    "_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": "2dGUKEbt1Gu6zBOJEyBFpY"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "c4r5IWEOJJhrrEs3AlhdvQ",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1206,12 +1043,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 185,
-      "height": 109
+      "width": 82,
+      "height": 82
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1222,7 +1059,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "958s5XSI9A27c10Hifgol2"
+    "fileId": "815VW7cKBEJrlTScdVj8Vb"
   },
   {
     "__type__": "cc.Sprite",
@@ -1234,7 +1071,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1247,7 +1084,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "47941042-16a7-40b0-8e33-bede423d0222@f9941",
+      "__uuid__": "5f289798-fbde-4097-8eb7-09e96605b466@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1267,7 +1104,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "247isXbhZF2JZ7RGClWad2"
+    "fileId": "647F56I0ZBhpYnAATVr/Za"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1277,7 +1114,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "f5k1Eee4xKybiNHYS7baNn",
+    "fileId": "59X6yVZSNG4aaV8TawU/dx",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1292,7 +1129,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1320,7 +1157,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1365,7 +1202,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 51
     },
     "sf_bg_select": {
       "__uuid__": "3a64131b-63dc-4fd3-88ec-2bd86ca51cf8@f9941",
@@ -1393,9 +1230,17 @@
     "img_keduihuan": {
       "__id__": 27
     },
-    "img_kuang": {
+    "img_id": {
       "__id__": 40
     },
+    "sf_img_score": {
+      "__uuid__": "5f289798-fbde-4097-8eb7-09e96605b466@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "sf_img_suipian": {
+      "__uuid__": "7398099b-e76a-4393-9b10-a0ff075b21c9@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_id": ""
   },
   {

assets/script/ui/car_lib/car_lib_list_item.ts

@@ -14,7 +14,9 @@ export class car_lib_list_item extends Component {
     @property(Node) suo_node:Node = null
     @property(Node) img_suo:Node = null
     @property(Node) img_keduihuan:Node = null
-    @property(Node) img_kuang:Node = null
+    @property(Node) img_id:Node = null
+    @property(SpriteFrame) sf_img_score:SpriteFrame = null
+    @property(SpriteFrame) sf_img_suipian:SpriteFrame = null
     private m_data:car_item_data = null
     private m_index:number = 0
     private m_cb = null
@@ -35,11 +37,11 @@ export class car_lib_list_item extends Component {
         this.lab_car_name.getComponent(Label).string = data.name
         if(data.stype==car_type.score) {
             this.lab_car_score.getComponent(Label).string = data.unlock_points + '分'
-            this.img_kuang.active = false
+            this.img_id.getComponent(Sprite).spriteFrame = this.sf_img_score
         } else {
             let string = `${data.temp_bag_list_item_data.quantity}/${data.unlock_points}碎片`
             this.lab_car_score.getComponent(Label).string = string
-            this.img_kuang.active = true
+            this.img_id.getComponent(Sprite).spriteFrame = this.sf_img_suipian
         }
         this.img_keduihuan.active = false
 

assets/texture/ui/car_lib/car_lib_id_score.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5f289798-fbde-4097-8eb7-09e96605b466",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5f289798-fbde-4097-8eb7-09e96605b466@6c48a",
+      "displayName": "car_lib_id_score",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5f289798-fbde-4097-8eb7-09e96605b466",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "5f289798-fbde-4097-8eb7-09e96605b466@f9941",
+      "displayName": "car_lib_id_score",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -1,
+        "offsetY": 0,
+        "trimX": 1,
+        "trimY": 2,
+        "width": 82,
+        "height": 82,
+        "rawWidth": 86,
+        "rawHeight": 86,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -41,
+            -41,
+            0,
+            41,
+            -41,
+            0,
+            -41,
+            41,
+            0,
+            41,
+            41,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            84,
+            83,
+            84,
+            1,
+            2,
+            83,
+            2
+          ],
+          "nuv": [
+            0.011627906976744186,
+            0.023255813953488372,
+            0.9651162790697675,
+            0.023255813953488372,
+            0.011627906976744186,
+            0.9767441860465116,
+            0.9651162790697675,
+            0.9767441860465116
+          ],
+          "minPos": [
+            -41,
+            -41,
+            0
+          ],
+          "maxPos": [
+            41,
+            41,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5f289798-fbde-4097-8eb7-09e96605b466@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5f289798-fbde-4097-8eb7-09e96605b466@f9941"
+  }
+}

assets/texture/ui/car_lib/car_lib_kuang.png.meta → assets/texture/ui/car_lib/car_lib_id_suipian.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "47941042-16a7-40b0-8e33-bede423d0222",
+  "uuid": "7398099b-e76a-4393-9b10-a0ff075b21c9",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "47941042-16a7-40b0-8e33-bede423d0222@6c48a",
-      "displayName": "car_lib_kuang",
+      "uuid": "7398099b-e76a-4393-9b10-a0ff075b21c9@6c48a",
+      "displayName": "car_lib_id_suipian",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "47941042-16a7-40b0-8e33-bede423d0222",
+        "imageUuidOrDatabaseUri": "7398099b-e76a-4393-9b10-a0ff075b21c9",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,22 +34,22 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "47941042-16a7-40b0-8e33-bede423d0222@f9941",
-      "displayName": "car_lib_kuang",
+      "uuid": "7398099b-e76a-4393-9b10-a0ff075b21c9@f9941",
+      "displayName": "car_lib_id_suipian",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
+        "offsetX": -1,
+        "offsetY": 1,
+        "trimX": 1,
         "trimY": 0,
-        "width": 185,
-        "height": 109,
-        "rawWidth": 185,
-        "rawHeight": 109,
+        "width": 82,
+        "height": 84,
+        "rawWidth": 86,
+        "rawHeight": 86,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -92.5,
-            -54.5,
+            -41,
+            -42,
             0,
-            92.5,
-            -54.5,
+            41,
+            -42,
             0,
-            -92.5,
-            54.5,
+            -41,
+            42,
             0,
-            92.5,
-            54.5,
+            41,
+            42,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            0,
-            109,
-            185,
-            109,
-            0,
-            0,
-            185,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
             1,
-            0,
-            0,
+            86,
+            83,
+            86,
             1,
+            2,
+            83,
+            2
+          ],
+          "nuv": [
+            0.011627906976744186,
+            0.023255813953488372,
+            0.9651162790697675,
+            0.023255813953488372,
+            0.011627906976744186,
             1,
+            0.9651162790697675,
             1
           ],
           "minPos": [
-            -92.5,
-            -54.5,
+            -41,
+            -42,
             0
           ],
           "maxPos": [
-            92.5,
-            54.5,
+            41,
+            42,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "47941042-16a7-40b0-8e33-bede423d0222@6c48a",
+        "imageUuidOrDatabaseUri": "7398099b-e76a-4393-9b10-a0ff075b21c9@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "47941042-16a7-40b0-8e33-bede423d0222@f9941"
+    "redirect": "7398099b-e76a-4393-9b10-a0ff075b21c9@f9941"
   }
 }

assets/texture/ui/car_lib/car_lib_suo.png.meta

@@ -43,11 +43,11 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0.5,
+        "offsetY": 0,
         "trimX": 0,
-        "trimY": 0,
+        "trimY": 1,
         "width": 100,
-        "height": 123,
+        "height": 122,
         "rawWidth": 100,
         "rawHeight": 124,
         "borderTop": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -50,
-            -61.5,
+            -61,
             0,
             50,
-            -61.5,
+            -61,
             0,
             -50,
-            61.5,
+            61,
             0,
             50,
-            61.5,
+            61,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            124,
+            123,
             100,
-            124,
+            123,
             0,
             1,
             100,
@@ -98,18 +98,18 @@
             1,
             0.008064516129032258,
             0,
+            0.9919354838709677,
             1,
-            1,
-            1
+            0.9919354838709677
           ],
           "minPos": [
             -50,
-            -61.5,
+            -61,
             0
           ],
           "maxPos": [
             50,
-            61.5,
+            61,
             0
           ]
         },