woso_javan 3 päivää sitten
vanhempi
commit
602bda72de

+ 259 - 92
assets/bundles/ui/UIGame.prefab

@@ -22,26 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 47
+        "__id__": 54
       },
       {
-        "__id__": 82
+        "__id__": 93
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 100
+        "__id__": 111
       },
       {
-        "__id__": 102
+        "__id__": 113
       },
       {
-        "__id__": 104
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 117
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -172,11 +172,32 @@
       },
       {
         "__id__": 45
+      },
+      {
+        "__id__": 46
+      },
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 48
+      },
+      {
+        "__id__": 49
+      },
+      {
+        "__id__": 50
+      },
+      {
+        "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "removedComponents": [
       {
-        "__id__": 46
+        "__id__": 53
       }
     ]
   },
@@ -206,7 +227,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -192.008,
+      "x": -192.00800000000004,
       "y": 724,
       "z": 0
     }
@@ -268,7 +289,7 @@
     "propertyPath": [
       "_alignFlags"
     ],
-    "value": 17
+    "value": 1
   },
   {
     "__type__": "cc.TargetInfo",
@@ -534,7 +555,7 @@
     "propertyPath": [
       "_actualFontSize"
     ],
-    "value": 32
+    "value": 36
   },
   {
     "__type__": "CCPropertyOverrideInfo",
@@ -559,6 +580,88 @@
       "__expectedType__": "cc.TTFFont"
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 27
+    },
+    "propertyPath": [
+      "_left"
+    ],
+    "value": 107.99199999999996
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_enableOutline"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_outlineColor"
+    ],
+    "value": {
+      "__type__": "cc.Color",
+      "r": 60,
+      "g": 112,
+      "b": 183,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_outlineWidth"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_color"
+    ],
+    "value": {
+      "__type__": "cc.Color",
+      "r": 133,
+      "g": 202,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_fontSize"
+    ],
+    "value": 36
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_lineHeight"
+    ],
+    "value": 40
+  },
   {
     "__type__": "cc.TargetInfo",
     "localID": [
@@ -572,14 +675,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 48
+      "__id__": 55
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 47
+      "__id__": 54
     },
     "asset": {
       "__uuid__": "7c472dc3-af09-4df4-a4f9-6678aebc66b0",
@@ -587,7 +690,7 @@
     },
     "fileId": "80B9Z+Ar1O7Z786kNWGrHv",
     "instance": {
-      "__id__": 49
+      "__id__": 56
     },
     "targetOverrides": null
   },
@@ -600,21 +703,6 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 50
-      },
-      {
-        "__id__": 52
-      },
-      {
-        "__id__": 53
-      },
-      {
-        "__id__": 54
-      },
-      {
-        "__id__": 55
-      },
       {
         "__id__": 57
       },
@@ -636,14 +724,17 @@
       {
         "__id__": 66
       },
+      {
+        "__id__": 67
+      },
       {
         "__id__": 68
       },
       {
-        "__id__": 70
+        "__id__": 69
       },
       {
-        "__id__": 72
+        "__id__": 71
       },
       {
         "__id__": 73
@@ -652,10 +743,7 @@
         "__id__": 75
       },
       {
-        "__id__": 76
-      },
-      {
-        "__id__": 78
+        "__id__": 77
       },
       {
         "__id__": 79
@@ -664,7 +752,34 @@
         "__id__": 80
       },
       {
-        "__id__": 81
+        "__id__": 82
+      },
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 85
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 87
+      },
+      {
+        "__id__": 88
+      },
+      {
+        "__id__": 89
+      },
+      {
+        "__id__": 90
+      },
+      {
+        "__id__": 91
+      },
+      {
+        "__id__": 92
       }
     ],
     "removedComponents": []
@@ -672,7 +787,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 51
+      "__id__": 58
     },
     "propertyPath": [
       "_name"
@@ -688,14 +803,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 51
+      "__id__": 58
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 74.961,
+      "x": 90,
       "y": 724,
       "z": 0
     }
@@ -703,7 +818,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 51
+      "__id__": 58
     },
     "propertyPath": [
       "_lrot"
@@ -719,7 +834,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 51
+      "__id__": 58
     },
     "propertyPath": [
       "_euler"
@@ -734,12 +849,12 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 63
     },
     "propertyPath": [
       "_alignFlags"
     ],
-    "value": 17
+    "value": 1
   },
   {
     "__type__": "cc.TargetInfo",
@@ -750,7 +865,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 58
+      "__id__": 65
     },
     "propertyPath": [
       "_active"
@@ -766,7 +881,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 63
     },
     "propertyPath": [
       "_top"
@@ -776,7 +891,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 63
     },
     "propertyPath": [
       "_lockFlags"
@@ -786,7 +901,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 63
     },
     "propertyPath": [
       "_horizontalCenter"
@@ -796,7 +911,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 63
+      "__id__": 70
     },
     "propertyPath": [
       "_contentSize"
@@ -816,7 +931,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 65
+      "__id__": 72
     },
     "propertyPath": [
       "_sizeMode"
@@ -832,7 +947,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 74
     },
     "propertyPath": [
       "_contentSize"
@@ -852,7 +967,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 69
+      "__id__": 76
     },
     "propertyPath": [
       "_lpos"
@@ -873,7 +988,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 71
+      "__id__": 78
     },
     "propertyPath": [
       "_lpos"
@@ -894,7 +1009,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 58
+      "__id__": 65
     },
     "propertyPath": [
       "_lpos"
@@ -909,7 +1024,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 81
     },
     "propertyPath": [
       "_type"
@@ -925,7 +1040,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 81
     },
     "propertyPath": [
       "_sizeMode"
@@ -935,7 +1050,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 77
+      "__id__": 84
     },
     "propertyPath": [
       "_enableWrapText"
@@ -951,7 +1066,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 77
+      "__id__": 84
     },
     "propertyPath": [
       "_actualFontSize"
@@ -961,7 +1076,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 77
+      "__id__": 84
     },
     "propertyPath": [
       "_cacheMode"
@@ -971,7 +1086,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 77
+      "__id__": 84
     },
     "propertyPath": [
       "_isSystemFontUsed"
@@ -981,7 +1096,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 77
+      "__id__": 84
     },
     "propertyPath": [
       "_font"
@@ -991,6 +1106,58 @@
       "__expectedType__": "cc.TTFFont"
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 84
+    },
+    "propertyPath": [
+      "_color"
+    ],
+    "value": {
+      "__type__": "cc.Color",
+      "r": 133,
+      "g": 202,
+      "b": 255,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 84
+    },
+    "propertyPath": [
+      "_enableOutline"
+    ],
+    "value": true
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 84
+    },
+    "propertyPath": [
+      "_outlineColor"
+    ],
+    "value": {
+      "__type__": "cc.Color",
+      "r": 60,
+      "g": 112,
+      "b": 183,
+      "a": 255
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 84
+    },
+    "propertyPath": [
+      "_outlineWidth"
+    ],
+    "value": 2
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -998,14 +1165,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 83
+      "__id__": 94
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 82
+      "__id__": 93
     },
     "asset": {
       "__uuid__": "97df4867-ae74-48cf-a999-483cbac9cc6f",
@@ -1013,7 +1180,7 @@
     },
     "fileId": "f3Bka97HBLC70aYs8RpRDZ",
     "instance": {
-      "__id__": 84
+      "__id__": 95
     },
     "targetOverrides": null
   },
@@ -1027,40 +1194,40 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 85
+        "__id__": 96
       },
       {
-        "__id__": 87
+        "__id__": 98
       },
       {
-        "__id__": 88
+        "__id__": 99
       },
       {
-        "__id__": 89
+        "__id__": 100
       },
       {
-        "__id__": 90
+        "__id__": 101
       },
       {
-        "__id__": 92
+        "__id__": 103
       },
       {
-        "__id__": 93
+        "__id__": 104
       },
       {
-        "__id__": 94
+        "__id__": 105
       },
       {
-        "__id__": 95
+        "__id__": 106
       },
       {
-        "__id__": 96
+        "__id__": 107
       },
       {
-        "__id__": 97
+        "__id__": 108
       },
       {
-        "__id__": 98
+        "__id__": 109
       }
     ],
     "removedComponents": []
@@ -1068,7 +1235,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 97
     },
     "propertyPath": [
       "_name"
@@ -1084,7 +1251,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 97
     },
     "propertyPath": [
       "_lpos"
@@ -1099,7 +1266,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 97
     },
     "propertyPath": [
       "_lrot"
@@ -1115,7 +1282,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 97
     },
     "propertyPath": [
       "_euler"
@@ -1130,7 +1297,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_alignFlags"
@@ -1146,7 +1313,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_top"
@@ -1156,7 +1323,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_left"
@@ -1166,7 +1333,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_right"
@@ -1176,7 +1343,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_lockFlags"
@@ -1186,7 +1353,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 91
+      "__id__": 102
     },
     "propertyPath": [
       "_horizontalCenter"
@@ -1196,7 +1363,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 97
     },
     "propertyPath": [
       "_active"
@@ -1206,7 +1373,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 99
+      "__id__": 110
     },
     "propertyPath": [
       "_contentSize"
@@ -1233,11 +1400,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 112
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1261,7 +1428,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 114
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1297,7 +1464,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 116
     },
     "uiType": 0,
     "_id": ""
@@ -1319,10 +1486,10 @@
     "targetOverrides": [],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 82
+        "__id__": 93
       },
       {
-        "__id__": 47
+        "__id__": 54
       },
       {
         "__id__": 2

+ 1 - 1
assets/scripts/uiExtend/LabelTick.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node, Label, CCInteger } from "cc"
+import { _decorator, Component, Node, Label, CCInteger, Color } from "cc"
 const { ccclass, property, requireComponent } = _decorator
 
 @ccclass("UIExtend/LabelTick")

+ 1 - 1
assets/scripts/uiItem/TimeItem.ts

@@ -25,7 +25,7 @@ export class TimeItem extends Component {
         this.leftTime = Math.max(v, 0)
         EventMgr.emit(EventType.TimeTick, this.leftTime)
         this._label.string = TimeUtil.formatTime_HHMMSS(Math.round(this.leftTime) * 1000)
-        this._label.color = this.leftTime <= 5 ? Color.RED : Color.WHITE
+        this._label.color = this.leftTime <= 5 ? Color.RED : new Color(133, 202, 255)
     }
 
     private _freezeTime: number = 0