111

assets/bundles/ui/UIGame.prefab

@@ -22,26 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 41
+        "__id__": 47
       },
       {
-        "__id__": 70
+        "__id__": 82
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 100
       },
       {
-        "__id__": 90
+        "__id__": 102
       },
       {
-        "__id__": 92
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -95,7 +95,8 @@
     "fileId": "16guJqMb5Eup2r3IjuQlY8",
     "instance": {
       "__id__": 4
-    }
+    },
+    "targetOverrides": null
   },
   {
     "__type__": "cc.PrefabInstance",
@@ -156,11 +157,26 @@
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
+      },
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 45
       }
     ],
     "removedComponents": [
       {
-        "__id__": 40
+        "__id__": 46
       }
     ]
   },
@@ -416,7 +432,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 30,
+      "x": 40,
       "y": 0,
       "z": 0
     }
@@ -437,7 +453,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 40.713,
+      "x": 43,
       "y": 0,
       "z": 0
     }
@@ -484,6 +500,65 @@
       "9adAmlzW1FR5eWPPqExv/J"
     ]
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_cacheMode"
+    ],
+    "value": 1
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "5aBz7jp8dOU6Rwg7PvdekM"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_enableWrapText"
+    ],
+    "value": false
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_actualFontSize"
+    ],
+    "value": 32
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_isSystemFontUsed"
+    ],
+    "value": false
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 41
+    },
+    "propertyPath": [
+      "_font"
+    ],
+    "value": {
+      "__uuid__": "b396e0a4-493d-4c5b-af06-66ba37f8dc1e",
+      "__expectedType__": "cc.TTFFont"
+    }
+  },
   {
     "__type__": "cc.TargetInfo",
     "localID": [
@@ -497,14 +572,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 42
+      "__id__": 48
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 41
+      "__id__": 47
     },
     "asset": {
       "__uuid__": "7c472dc3-af09-4df4-a4f9-6678aebc66b0",
@@ -512,7 +587,7 @@
     },
     "fileId": "80B9Z+Ar1O7Z786kNWGrHv",
     "instance": {
-      "__id__": 43
+      "__id__": 49
     },
     "targetOverrides": null
   },
@@ -526,55 +601,70 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 44
+        "__id__": 50
       },
       {
-        "__id__": 46
+        "__id__": 52
       },
       {
-        "__id__": 47
+        "__id__": 53
       },
       {
-        "__id__": 48
+        "__id__": 54
       },
       {
-        "__id__": 49
+        "__id__": 55
       },
       {
-        "__id__": 51
+        "__id__": 57
       },
       {
-        "__id__": 53
+        "__id__": 59
       },
       {
-        "__id__": 54
+        "__id__": 60
       },
       {
-        "__id__": 55
+        "__id__": 61
       },
       {
-        "__id__": 56
+        "__id__": 62
       },
       {
-        "__id__": 58
+        "__id__": 64
       },
       {
-        "__id__": 60
+        "__id__": 66
       },
       {
-        "__id__": 62
+        "__id__": 68
       },
       {
-        "__id__": 64
+        "__id__": 70
       },
       {
-        "__id__": 66
+        "__id__": 72
       },
       {
-        "__id__": 67
+        "__id__": 73
       },
       {
-        "__id__": 69
+        "__id__": 75
+      },
+      {
+        "__id__": 76
+      },
+      {
+        "__id__": 78
+      },
+      {
+        "__id__": 79
+      },
+      {
+        "__id__": 80
+      },
+      {
+        "__id__": 81
       }
     ],
     "removedComponents": []
@@ -582,7 +672,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 51
     },
     "propertyPath": [
       "_name"
@@ -598,7 +688,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 51
     },
     "propertyPath": [
       "_lpos"
@@ -613,7 +703,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 51
     },
     "propertyPath": [
       "_lrot"
@@ -629,7 +719,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 51
     },
     "propertyPath": [
       "_euler"
@@ -644,7 +734,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 56
     },
     "propertyPath": [
       "_alignFlags"
@@ -660,7 +750,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 52
+      "__id__": 58
     },
     "propertyPath": [
       "_active"
@@ -676,7 +766,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 56
     },
     "propertyPath": [
       "_top"
@@ -686,7 +776,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 56
     },
     "propertyPath": [
       "_lockFlags"
@@ -696,7 +786,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 50
+      "__id__": 56
     },
     "propertyPath": [
       "_horizontalCenter"
@@ -706,7 +796,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 57
+      "__id__": 63
     },
     "propertyPath": [
       "_contentSize"
@@ -726,7 +816,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 59
+      "__id__": 65
     },
     "propertyPath": [
       "_sizeMode"
@@ -742,7 +832,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 61
+      "__id__": 67
     },
     "propertyPath": [
       "_contentSize"
@@ -762,14 +852,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 63
+      "__id__": 69
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 30,
+      "x": 40,
       "y": 0,
       "z": 0
     }
@@ -783,14 +873,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 65
+      "__id__": 71
     },
     "propertyPath": [
       "_lpos"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 40.798,
+      "x": 43,
       "y": 0,
       "z": 0
     }
@@ -804,7 +894,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 52
+      "__id__": 58
     },
     "propertyPath": [
       "_lpos"
@@ -819,7 +909,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 68
+      "__id__": 74
     },
     "propertyPath": [
       "_type"
@@ -835,13 +925,72 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 68
+      "__id__": 74
     },
     "propertyPath": [
       "_sizeMode"
     ],
     "value": 0
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_enableWrapText"
+    ],
+    "value": false
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f1BteuhtlMxIjHMhI19O9P"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_actualFontSize"
+    ],
+    "value": 36
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_cacheMode"
+    ],
+    "value": 2
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_isSystemFontUsed"
+    ],
+    "value": false
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_font"
+    ],
+    "value": {
+      "__uuid__": "b396e0a4-493d-4c5b-af06-66ba37f8dc1e",
+      "__expectedType__": "cc.TTFFont"
+    }
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -849,14 +998,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 71
+      "__id__": 83
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 70
+      "__id__": 82
     },
     "asset": {
       "__uuid__": "97df4867-ae74-48cf-a999-483cbac9cc6f",
@@ -864,7 +1013,7 @@
     },
     "fileId": "f3Bka97HBLC70aYs8RpRDZ",
     "instance": {
-      "__id__": 72
+      "__id__": 84
     },
     "targetOverrides": null
   },
@@ -878,40 +1027,40 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 73
+        "__id__": 85
       },
       {
-        "__id__": 75
+        "__id__": 87
       },
       {
-        "__id__": 76
+        "__id__": 88
       },
       {
-        "__id__": 77
+        "__id__": 89
       },
       {
-        "__id__": 78
+        "__id__": 90
       },
       {
-        "__id__": 80
+        "__id__": 92
       },
       {
-        "__id__": 81
+        "__id__": 93
       },
       {
-        "__id__": 82
+        "__id__": 94
       },
       {
-        "__id__": 83
+        "__id__": 95
       },
       {
-        "__id__": 84
+        "__id__": 96
       },
       {
-        "__id__": 85
+        "__id__": 97
       },
       {
-        "__id__": 86
+        "__id__": 98
       }
     ],
     "removedComponents": []
@@ -919,7 +1068,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 86
     },
     "propertyPath": [
       "_name"
@@ -935,7 +1084,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 86
     },
     "propertyPath": [
       "_lpos"
@@ -950,7 +1099,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 86
     },
     "propertyPath": [
       "_lrot"
@@ -966,7 +1115,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 86
     },
     "propertyPath": [
       "_euler"
@@ -981,7 +1130,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_alignFlags"
@@ -997,7 +1146,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_top"
@@ -1007,7 +1156,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_left"
@@ -1017,7 +1166,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_right"
@@ -1027,7 +1176,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_lockFlags"
@@ -1037,7 +1186,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 79
+      "__id__": 91
     },
     "propertyPath": [
       "_horizontalCenter"
@@ -1047,7 +1196,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 86
     },
     "propertyPath": [
       "_active"
@@ -1057,7 +1206,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 87
+      "__id__": 99
     },
     "propertyPath": [
       "_contentSize"
@@ -1084,7 +1233,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 101
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1112,7 +1261,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 103
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1148,7 +1297,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 105
     },
     "uiType": 0,
     "_id": ""
@@ -1170,10 +1319,10 @@
     "targetOverrides": [],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 70
+        "__id__": 82
       },
       {
-        "__id__": 41
+        "__id__": 47
       },
       {
         "__id__": 2