From 84d10a7aca5ad27ce15bd518ab63348b178d70ae Mon Sep 17 00:00:00 2001 From: panw Date: Mon, 22 Dec 2025 15:37:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(gui):=20=E6=9B=B4=E6=96=B0=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E4=BF=A1=E6=81=AF=E9=A2=84=E5=88=B6=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E5=92=8C=E5=B0=BA=E5=AF=B8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重命名节点以简化命名规范 - 调整背景和边框的尺寸及缩放比例 - 更新精灵帧和颜色配置 - 修改部件边距和锚点设置 --- assets/resources/gui/role_controller.prefab | 1435 +++++++++---------- assets/resources/gui/ubgs.plist.meta | 236 +-- assets/resources/gui/uis/bgs/bg_info.prefab | 89 +- 3 files changed, 895 insertions(+), 865 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 9a790f93..dfeeecb5 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 167 }, { - "__id__": 666 + "__id__": 664 }, { - "__id__": 694 + "__id__": 692 } ], "_active": true, "_components": [ + { + "__id__": 738 + }, { "__id__": 740 }, { "__id__": 742 - }, - { - "__id__": 744 } ], "_prefab": { - "__id__": 746 + "__id__": 744 }, "_lpos": { "__type__": "cc.Vec3", @@ -3897,26 +3897,29 @@ "__id__": 182 }, { - "__id__": 549 + "__id__": 547 }, { - "__id__": 571 + "__id__": 569 }, { - "__id__": 586 + "__id__": 584 }, { - "__id__": 611 + "__id__": 609 }, { - "__id__": 623 + "__id__": 621 }, { - "__id__": 640 + "__id__": 638 } ], "_active": true, "_components": [ + { + "__id__": 655 + }, { "__id__": 657 }, @@ -3925,13 +3928,10 @@ }, { "__id__": 661 - }, - { - "__id__": 663 } ], "_prefab": { - "__id__": 665 + "__id__": 663 }, "_lpos": { "__type__": "cc.Vec3", @@ -4280,20 +4280,20 @@ "__id__": 191 }, { - "__id__": 528 + "__id__": 526 } ], "_active": true, "_components": [ { - "__id__": 544 + "__id__": 542 }, { - "__id__": 546 + "__id__": 544 } ], "_prefab": { - "__id__": 548 + "__id__": 546 }, "_lpos": { "__type__": "cc.Vec3", @@ -4515,26 +4515,26 @@ "__id__": 192 }, { - "__id__": 213 + "__id__": 211 }, { - "__id__": 487 + "__id__": 485 }, { - "__id__": 503 + "__id__": 501 }, { - "__id__": 519 + "__id__": 517 } ], "_active": true, "_components": [ { - "__id__": 525 + "__id__": 523 } ], "_prefab": { - "__id__": 527 + "__id__": 525 }, "_lpos": { "__type__": "cc.Vec3", @@ -4627,14 +4627,11 @@ { "__id__": 208 }, + { + "__id__": 209 + }, { "__id__": 210 - }, - { - "__id__": 211 - }, - { - "__id__": 212 } ], "removedComponents": [] @@ -4766,26 +4763,6 @@ "targetInfo": { "__id__": 207 }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 1680, - "height": 480 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "fbeQHbeipFY7ExzedhFNLM" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 209 - }, "propertyPath": [ "_left" ], @@ -4800,7 +4777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 209 + "__id__": 207 }, "propertyPath": [ "_right" @@ -4810,7 +4787,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 209 + "__id__": 207 }, "propertyPath": [ "_top" @@ -4820,7 +4797,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 209 + "__id__": 207 }, "propertyPath": [ "_bottom" @@ -4837,38 +4814,38 @@ }, "_children": [ { - "__id__": 214 + "__id__": 212 }, { - "__id__": 257 + "__id__": 255 }, { - "__id__": 300 + "__id__": 298 }, { - "__id__": 347 + "__id__": 345 }, { - "__id__": 390 + "__id__": 388 }, { - "__id__": 435 + "__id__": 433 } ], "_active": true, "_components": [ + { + "__id__": 478 + }, { "__id__": 480 }, { "__id__": 482 - }, - { - "__id__": 484 } ], "_prefab": { - "__id__": 486 + "__id__": 484 }, "_lpos": { "__type__": "cc.Vec3", @@ -4905,27 +4882,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 215 + "__id__": 213 }, { - "__id__": 242 + "__id__": 240 }, { - "__id__": 248 + "__id__": 246 } ], "_active": true, "_components": [ { - "__id__": 254 + "__id__": 252 } ], "_prefab": { - "__id__": 256 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -4960,17 +4937,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 214 + "__id__": 212 }, "_prefab": { - "__id__": 216 + "__id__": 214 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 215 + "__id__": 213 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -4978,7 +4955,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 217 + "__id__": 215 }, "targetOverrides": null }, @@ -4991,18 +4968,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 216 + }, { "__id__": 218 }, + { + "__id__": 219 + }, { "__id__": 220 }, { "__id__": 221 }, - { - "__id__": 222 - }, { "__id__": 223 }, @@ -5025,13 +5005,10 @@ "__id__": 235 }, { - "__id__": 237 + "__id__": 236 }, { "__id__": 238 - }, - { - "__id__": 240 } ], "removedComponents": [] @@ -5039,7 +5016,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 217 }, "propertyPath": [ "_name" @@ -5055,7 +5032,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 217 }, "propertyPath": [ "_lpos" @@ -5070,7 +5047,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 217 }, "propertyPath": [ "_lrot" @@ -5086,7 +5063,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 217 }, "propertyPath": [ "_euler" @@ -5101,7 +5078,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 224 + "__id__": 222 }, "propertyPath": [ "_contentSize" @@ -5121,7 +5098,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 226 + "__id__": 224 }, "propertyPath": [ "_contentSize" @@ -5141,7 +5118,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 228 + "__id__": 226 }, "propertyPath": [ "_lpos" @@ -5162,7 +5139,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 230 + "__id__": 228 }, "propertyPath": [ "_contentSize" @@ -5182,7 +5159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 232 + "__id__": 230 }, "propertyPath": [ "_contentSize" @@ -5202,7 +5179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 234 + "__id__": 232 }, "propertyPath": [ "_spriteFrame" @@ -5221,7 +5198,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 236 + "__id__": 234 }, "propertyPath": [ "_spriteFrame" @@ -5240,7 +5217,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 224 + "__id__": 222 }, "propertyPath": [ "_anchorPoint" @@ -5254,7 +5231,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 237 }, "propertyPath": [ "_lpos" @@ -5275,7 +5252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 239 }, "propertyPath": [ "_lpos" @@ -5299,20 +5276,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ { - "__id__": 243 + "__id__": 241 }, { - "__id__": 245 + "__id__": 243 } ], "_prefab": { - "__id__": 247 + "__id__": 245 }, "_lpos": { "__type__": "cc.Vec3", @@ -5349,11 +5326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -5377,11 +5354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5458,20 +5435,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ { - "__id__": 249 + "__id__": 247 }, { - "__id__": 251 + "__id__": 249 } ], "_prefab": { - "__id__": 253 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -5508,11 +5485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -5536,11 +5513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 250 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5617,11 +5594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -5658,27 +5635,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 258 + "__id__": 256 }, { - "__id__": 285 + "__id__": 283 }, { - "__id__": 291 + "__id__": 289 } ], "_active": true, "_components": [ { - "__id__": 297 + "__id__": 295 } ], "_prefab": { - "__id__": 299 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -5713,17 +5690,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 257 + "__id__": 255 }, "_prefab": { - "__id__": 259 + "__id__": 257 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 258 + "__id__": 256 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -5731,7 +5708,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 260 + "__id__": 258 }, "targetOverrides": null }, @@ -5744,18 +5721,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 259 + }, { "__id__": 261 }, + { + "__id__": 262 + }, { "__id__": 263 }, { "__id__": 264 }, - { - "__id__": 265 - }, { "__id__": 266 }, @@ -5778,13 +5758,10 @@ "__id__": 278 }, { - "__id__": 280 + "__id__": 279 }, { "__id__": 281 - }, - { - "__id__": 283 } ], "removedComponents": [] @@ -5792,7 +5769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 262 + "__id__": 260 }, "propertyPath": [ "_name" @@ -5808,7 +5785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 262 + "__id__": 260 }, "propertyPath": [ "_lpos" @@ -5823,7 +5800,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 262 + "__id__": 260 }, "propertyPath": [ "_lrot" @@ -5839,7 +5816,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 262 + "__id__": 260 }, "propertyPath": [ "_euler" @@ -5854,7 +5831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 267 + "__id__": 265 }, "propertyPath": [ "_contentSize" @@ -5874,7 +5851,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 269 + "__id__": 267 }, "propertyPath": [ "_contentSize" @@ -5894,7 +5871,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 271 + "__id__": 269 }, "propertyPath": [ "_lpos" @@ -5915,7 +5892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 273 + "__id__": 271 }, "propertyPath": [ "_contentSize" @@ -5935,7 +5912,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 275 + "__id__": 273 }, "propertyPath": [ "_contentSize" @@ -5955,7 +5932,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 277 + "__id__": 275 }, "propertyPath": [ "_spriteFrame" @@ -5974,7 +5951,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 277 }, "propertyPath": [ "_spriteFrame" @@ -5993,7 +5970,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 267 + "__id__": 265 }, "propertyPath": [ "_anchorPoint" @@ -6007,7 +5984,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 282 + "__id__": 280 }, "propertyPath": [ "_lpos" @@ -6028,7 +6005,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 282 }, "propertyPath": [ "_lpos" @@ -6052,20 +6029,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 257 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 284 }, { - "__id__": 288 + "__id__": 286 } ], "_prefab": { - "__id__": 290 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -6102,11 +6079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 285 }, "_contentSize": { "__type__": "cc.Size", @@ -6130,11 +6107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 287 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6211,20 +6188,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 257 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 290 }, { - "__id__": 294 + "__id__": 292 } ], "_prefab": { - "__id__": 296 + "__id__": 294 }, "_lpos": { "__type__": "cc.Vec3", @@ -6261,11 +6238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -6289,11 +6266,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6370,11 +6347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 296 }, "_contentSize": { "__type__": "cc.Size", @@ -6411,27 +6388,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 301 + "__id__": 299 }, { - "__id__": 332 + "__id__": 330 }, { - "__id__": 338 + "__id__": 336 } ], "_active": true, "_components": [ { - "__id__": 344 + "__id__": 342 } ], "_prefab": { - "__id__": 346 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", @@ -6466,17 +6443,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 300 + "__id__": 298 }, "_prefab": { - "__id__": 302 + "__id__": 300 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 301 + "__id__": 299 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -6484,7 +6461,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 303 + "__id__": 301 }, "targetOverrides": null }, @@ -6497,22 +6474,25 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 304 + "__id__": 302 } ], "propertyOverrides": [ + { + "__id__": 306 + }, { "__id__": 308 }, + { + "__id__": 309 + }, { "__id__": 310 }, { "__id__": 311 }, - { - "__id__": 312 - }, { "__id__": 313 }, @@ -6535,13 +6515,10 @@ "__id__": 325 }, { - "__id__": 327 + "__id__": 326 }, { "__id__": 328 - }, - { - "__id__": 330 } ], "removedComponents": [] @@ -6549,11 +6526,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 305 + "__id__": 303 }, "components": [ { - "__id__": 306 + "__id__": 304 } ] }, @@ -6569,15 +6546,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 301 + "__id__": 299 } }, "node": { - "__id__": 301 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 305 }, "_alignFlags": 16, "_target": null, @@ -6606,7 +6583,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 309 + "__id__": 307 }, "propertyPath": [ "_name" @@ -6622,7 +6599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 309 + "__id__": 307 }, "propertyPath": [ "_lpos" @@ -6637,7 +6614,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 309 + "__id__": 307 }, "propertyPath": [ "_lrot" @@ -6653,7 +6630,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 309 + "__id__": 307 }, "propertyPath": [ "_euler" @@ -6668,7 +6645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 314 + "__id__": 312 }, "propertyPath": [ "_contentSize" @@ -6688,7 +6665,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 316 + "__id__": 314 }, "propertyPath": [ "_contentSize" @@ -6708,7 +6685,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 316 }, "propertyPath": [ "_lpos" @@ -6729,7 +6706,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 320 + "__id__": 318 }, "propertyPath": [ "_contentSize" @@ -6749,7 +6726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 322 + "__id__": 320 }, "propertyPath": [ "_contentSize" @@ -6769,7 +6746,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 324 + "__id__": 322 }, "propertyPath": [ "_spriteFrame" @@ -6788,7 +6765,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 326 + "__id__": 324 }, "propertyPath": [ "_spriteFrame" @@ -6807,7 +6784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 314 + "__id__": 312 }, "propertyPath": [ "_anchorPoint" @@ -6821,7 +6798,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 329 + "__id__": 327 }, "propertyPath": [ "_lpos" @@ -6842,7 +6819,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 331 + "__id__": 329 }, "propertyPath": [ "_lpos" @@ -6866,20 +6843,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 300 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 333 + "__id__": 331 }, { - "__id__": 335 + "__id__": 333 } ], "_prefab": { - "__id__": 337 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", @@ -6916,11 +6893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 332 }, "_contentSize": { "__type__": "cc.Size", @@ -6944,11 +6921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 334 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7025,20 +7002,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 300 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 337 }, { - "__id__": 341 + "__id__": 339 } ], "_prefab": { - "__id__": 343 + "__id__": 341 }, "_lpos": { "__type__": "cc.Vec3", @@ -7075,11 +7052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -7103,11 +7080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 340 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7184,11 +7161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -7225,27 +7202,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 348 + "__id__": 346 }, { - "__id__": 375 + "__id__": 373 }, { - "__id__": 381 + "__id__": 379 } ], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 385 } ], "_prefab": { - "__id__": 389 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -7280,17 +7257,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 347 + "__id__": 345 }, "_prefab": { - "__id__": 349 + "__id__": 347 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 348 + "__id__": 346 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -7298,7 +7275,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 350 + "__id__": 348 }, "targetOverrides": null }, @@ -7311,18 +7288,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 349 + }, { "__id__": 351 }, + { + "__id__": 352 + }, { "__id__": 353 }, { "__id__": 354 }, - { - "__id__": 355 - }, { "__id__": 356 }, @@ -7345,13 +7325,10 @@ "__id__": 368 }, { - "__id__": 370 + "__id__": 369 }, { "__id__": 371 - }, - { - "__id__": 373 } ], "removedComponents": [] @@ -7359,7 +7336,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 350 }, "propertyPath": [ "_name" @@ -7375,7 +7352,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 350 }, "propertyPath": [ "_lpos" @@ -7390,7 +7367,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 350 }, "propertyPath": [ "_lrot" @@ -7406,7 +7383,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 350 }, "propertyPath": [ "_euler" @@ -7421,7 +7398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 357 + "__id__": 355 }, "propertyPath": [ "_contentSize" @@ -7441,7 +7418,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 357 }, "propertyPath": [ "_contentSize" @@ -7461,7 +7438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 361 + "__id__": 359 }, "propertyPath": [ "_lpos" @@ -7482,7 +7459,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 363 + "__id__": 361 }, "propertyPath": [ "_contentSize" @@ -7502,7 +7479,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 365 + "__id__": 363 }, "propertyPath": [ "_contentSize" @@ -7522,7 +7499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 367 + "__id__": 365 }, "propertyPath": [ "_spriteFrame" @@ -7541,7 +7518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 369 + "__id__": 367 }, "propertyPath": [ "_spriteFrame" @@ -7560,7 +7537,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 357 + "__id__": 355 }, "propertyPath": [ "_anchorPoint" @@ -7574,7 +7551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 372 + "__id__": 370 }, "propertyPath": [ "_lpos" @@ -7595,7 +7572,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 374 + "__id__": 372 }, "propertyPath": [ "_lpos" @@ -7619,20 +7596,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 347 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 376 + "__id__": 374 }, { - "__id__": 378 + "__id__": 376 } ], "_prefab": { - "__id__": 380 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", @@ -7669,11 +7646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -7697,11 +7674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7778,20 +7755,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 347 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 380 }, { - "__id__": 384 + "__id__": 382 } ], "_prefab": { - "__id__": 386 + "__id__": 384 }, "_lpos": { "__type__": "cc.Vec3", @@ -7828,11 +7805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 379 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -7856,11 +7833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 379 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 383 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7937,11 +7914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 386 }, "_contentSize": { "__type__": "cc.Size", @@ -7978,27 +7955,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 391 + "__id__": 389 }, { - "__id__": 418 + "__id__": 416 }, { - "__id__": 426 + "__id__": 424 } ], "_active": true, "_components": [ { - "__id__": 432 + "__id__": 430 } ], "_prefab": { - "__id__": 434 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -8033,17 +8010,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 390 + "__id__": 388 }, "_prefab": { - "__id__": 392 + "__id__": 390 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 391 + "__id__": 389 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -8051,7 +8028,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 393 + "__id__": 391 }, "targetOverrides": null }, @@ -8064,18 +8041,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 392 + }, { "__id__": 394 }, + { + "__id__": 395 + }, { "__id__": 396 }, { "__id__": 397 }, - { - "__id__": 398 - }, { "__id__": 399 }, @@ -8098,13 +8078,10 @@ "__id__": 411 }, { - "__id__": 413 + "__id__": 412 }, { "__id__": 414 - }, - { - "__id__": 416 } ], "removedComponents": [] @@ -8112,7 +8089,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 393 }, "propertyPath": [ "_name" @@ -8128,7 +8105,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 393 }, "propertyPath": [ "_lpos" @@ -8143,7 +8120,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 393 }, "propertyPath": [ "_lrot" @@ -8159,7 +8136,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 393 }, "propertyPath": [ "_euler" @@ -8174,7 +8151,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 400 + "__id__": 398 }, "propertyPath": [ "_contentSize" @@ -8194,7 +8171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 402 + "__id__": 400 }, "propertyPath": [ "_contentSize" @@ -8214,7 +8191,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 404 + "__id__": 402 }, "propertyPath": [ "_lpos" @@ -8235,7 +8212,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 406 + "__id__": 404 }, "propertyPath": [ "_contentSize" @@ -8255,7 +8232,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 408 + "__id__": 406 }, "propertyPath": [ "_contentSize" @@ -8275,7 +8252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 410 + "__id__": 408 }, "propertyPath": [ "_spriteFrame" @@ -8294,7 +8271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 412 + "__id__": 410 }, "propertyPath": [ "_spriteFrame" @@ -8313,7 +8290,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 400 + "__id__": 398 }, "propertyPath": [ "_anchorPoint" @@ -8327,7 +8304,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 415 + "__id__": 413 }, "propertyPath": [ "_lpos" @@ -8348,7 +8325,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 417 + "__id__": 415 }, "propertyPath": [ "_lpos" @@ -8372,23 +8349,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 390 + "__id__": 388 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 417 + }, { "__id__": 419 }, { "__id__": 421 - }, - { - "__id__": 423 } ], "_prefab": { - "__id__": 425 + "__id__": 423 }, "_lpos": { "__type__": "cc.Vec3", @@ -8425,11 +8402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 418 }, "_contentSize": { "__type__": "cc.Size", @@ -8453,11 +8430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 420 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8521,11 +8498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 422 }, "_alignFlags": 18, "_target": null, @@ -8570,20 +8547,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 390 + "__id__": 388 }, "_children": [], "_active": true, "_components": [ { - "__id__": 427 + "__id__": 425 }, { - "__id__": 429 + "__id__": 427 } ], "_prefab": { - "__id__": 431 + "__id__": 429 }, "_lpos": { "__type__": "cc.Vec3", @@ -8620,11 +8597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -8648,11 +8625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 428 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8729,11 +8706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 431 }, "_contentSize": { "__type__": "cc.Size", @@ -8770,27 +8747,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 211 }, "_children": [ { - "__id__": 436 + "__id__": 434 }, { - "__id__": 463 + "__id__": 461 }, { - "__id__": 471 + "__id__": 469 } ], "_active": true, "_components": [ { - "__id__": 477 + "__id__": 475 } ], "_prefab": { - "__id__": 479 + "__id__": 477 }, "_lpos": { "__type__": "cc.Vec3", @@ -8825,17 +8802,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 435 + "__id__": 433 }, "_prefab": { - "__id__": 437 + "__id__": 435 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 436 + "__id__": 434 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -8843,7 +8820,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 438 + "__id__": 436 }, "targetOverrides": null }, @@ -8856,18 +8833,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 437 + }, { "__id__": 439 }, + { + "__id__": 440 + }, { "__id__": 441 }, { "__id__": 442 }, - { - "__id__": 443 - }, { "__id__": 444 }, @@ -8890,13 +8870,10 @@ "__id__": 456 }, { - "__id__": 458 + "__id__": 457 }, { "__id__": 459 - }, - { - "__id__": 461 } ], "removedComponents": [] @@ -8904,7 +8881,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 438 }, "propertyPath": [ "_name" @@ -8920,7 +8897,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 438 }, "propertyPath": [ "_lpos" @@ -8935,7 +8912,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 438 }, "propertyPath": [ "_lrot" @@ -8951,7 +8928,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 438 }, "propertyPath": [ "_euler" @@ -8966,7 +8943,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 443 }, "propertyPath": [ "_contentSize" @@ -8986,7 +8963,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 447 + "__id__": 445 }, "propertyPath": [ "_contentSize" @@ -9006,7 +8983,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 449 + "__id__": 447 }, "propertyPath": [ "_lpos" @@ -9027,7 +9004,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 449 }, "propertyPath": [ "_contentSize" @@ -9047,7 +9024,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 451 }, "propertyPath": [ "_contentSize" @@ -9067,7 +9044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 453 }, "propertyPath": [ "_spriteFrame" @@ -9086,7 +9063,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 457 + "__id__": 455 }, "propertyPath": [ "_spriteFrame" @@ -9105,7 +9082,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 443 }, "propertyPath": [ "_anchorPoint" @@ -9119,7 +9096,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 460 + "__id__": 458 }, "propertyPath": [ "_lpos" @@ -9140,7 +9117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 462 + "__id__": 460 }, "propertyPath": [ "_lpos" @@ -9164,23 +9141,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 433 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 462 + }, { "__id__": 464 }, { "__id__": 466 - }, - { - "__id__": 468 } ], "_prefab": { - "__id__": 470 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -9217,11 +9194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 461 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 463 }, "_contentSize": { "__type__": "cc.Size", @@ -9245,11 +9222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 461 }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 465 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9313,11 +9290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 461 }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 467 }, "_alignFlags": 18, "_target": null, @@ -9362,20 +9339,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 433 }, "_children": [], "_active": true, "_components": [ { - "__id__": 472 + "__id__": 470 }, { - "__id__": 474 + "__id__": 472 } ], "_prefab": { - "__id__": 476 + "__id__": 474 }, "_lpos": { "__type__": "cc.Vec3", @@ -9412,11 +9389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 471 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 473 + "__id__": 471 }, "_contentSize": { "__type__": "cc.Size", @@ -9440,11 +9417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 471 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 473 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9521,11 +9498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 476 }, "_contentSize": { "__type__": "cc.Size", @@ -9562,11 +9539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 481 + "__id__": 479 }, "_contentSize": { "__type__": "cc.Size", @@ -9590,11 +9567,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 481 }, "_alignFlags": 45, "_target": null, @@ -9626,11 +9603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 483 }, "_resizeMode": 0, "_layoutType": 3, @@ -9681,20 +9658,20 @@ }, "_children": [ { - "__id__": 488 + "__id__": 486 }, { - "__id__": 494 + "__id__": 492 } ], "_active": false, "_components": [ { - "__id__": 500 + "__id__": 498 } ], "_prefab": { - "__id__": 502 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -9731,20 +9708,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 485 }, "_children": [], "_active": false, "_components": [ { - "__id__": 489 + "__id__": 487 }, { - "__id__": 491 + "__id__": 489 } ], "_prefab": { - "__id__": 493 + "__id__": 491 }, "_lpos": { "__type__": "cc.Vec3", @@ -9781,11 +9758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 486 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 488 }, "_contentSize": { "__type__": "cc.Size", @@ -9809,11 +9786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 486 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 490 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9870,20 +9847,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 485 }, "_children": [], "_active": false, "_components": [ { - "__id__": 495 + "__id__": 493 }, { - "__id__": 497 + "__id__": 495 } ], "_prefab": { - "__id__": 499 + "__id__": 497 }, "_lpos": { "__type__": "cc.Vec3", @@ -9920,11 +9897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 492 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 494 }, "_contentSize": { "__type__": "cc.Size", @@ -9948,11 +9925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 492 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 496 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10029,11 +10006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 501 + "__id__": 499 }, "_contentSize": { "__type__": "cc.Size", @@ -10074,20 +10051,20 @@ }, "_children": [ { - "__id__": 504 + "__id__": 502 }, { - "__id__": 510 + "__id__": 508 } ], "_active": false, "_components": [ { - "__id__": 516 + "__id__": 514 } ], "_prefab": { - "__id__": 518 + "__id__": 516 }, "_lpos": { "__type__": "cc.Vec3", @@ -10124,20 +10101,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 503 + "__id__": 501 }, "_children": [], "_active": false, "_components": [ { - "__id__": 505 + "__id__": 503 }, { - "__id__": 507 + "__id__": 505 } ], "_prefab": { - "__id__": 509 + "__id__": 507 }, "_lpos": { "__type__": "cc.Vec3", @@ -10174,11 +10151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 504 }, "_contentSize": { "__type__": "cc.Size", @@ -10202,11 +10179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 508 + "__id__": 506 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10263,20 +10240,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 503 + "__id__": 501 }, "_children": [], "_active": false, "_components": [ { - "__id__": 511 + "__id__": 509 }, { - "__id__": 513 + "__id__": 511 } ], "_prefab": { - "__id__": 515 + "__id__": 513 }, "_lpos": { "__type__": "cc.Vec3", @@ -10313,11 +10290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -10341,11 +10318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 512 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10422,11 +10399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 503 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 517 + "__id__": 515 }, "_contentSize": { "__type__": "cc.Size", @@ -10469,14 +10446,14 @@ "_active": true, "_components": [ { - "__id__": 520 + "__id__": 518 }, { - "__id__": 522 + "__id__": 520 } ], "_prefab": { - "__id__": 524 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -10513,11 +10490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 517 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 519 }, "_contentSize": { "__type__": "cc.Size", @@ -10541,11 +10518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 517 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 521 }, "_alignFlags": 40, "_target": null, @@ -10594,7 +10571,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 524 }, "_contentSize": { "__type__": "cc.Size", @@ -10635,20 +10612,20 @@ }, "_children": [ { - "__id__": 529 + "__id__": 527 } ], "_active": true, "_components": [ { - "__id__": 539 + "__id__": 537 }, { - "__id__": 541 + "__id__": 539 } ], "_prefab": { - "__id__": 543 + "__id__": 541 }, "_lpos": { "__type__": "cc.Vec3", @@ -10685,21 +10662,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 526 }, "_children": [ { - "__id__": 530 + "__id__": 528 } ], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 534 } ], "_prefab": { - "__id__": 538 + "__id__": 536 }, "_lpos": { "__type__": "cc.Vec3", @@ -10736,20 +10713,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 529 + "__id__": 527 }, "_children": [], "_active": true, "_components": [ { - "__id__": 531 + "__id__": 529 }, { - "__id__": 533 + "__id__": 531 } ], "_prefab": { - "__id__": 535 + "__id__": 533 }, "_lpos": { "__type__": "cc.Vec3", @@ -10786,11 +10763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 528 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 530 }, "_contentSize": { "__type__": "cc.Size", @@ -10814,11 +10791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 528 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 532 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10895,11 +10872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 527 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 535 }, "_contentSize": { "__type__": "cc.Size", @@ -10936,11 +10913,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -10964,11 +10941,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 542 + "__id__": 540 }, "_resizeMode": 0, "_layoutType": 1, @@ -11019,7 +10996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 543 }, "_contentSize": { "__type__": "cc.Size", @@ -11047,7 +11024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 545 }, "_alignFlags": 45, "_target": null, @@ -11096,26 +11073,26 @@ }, "_children": [ { - "__id__": 550 + "__id__": 548 }, { - "__id__": 558 + "__id__": 556 } ], "_active": true, "_components": [ + { + "__id__": 562 + }, { "__id__": 564 }, { "__id__": 566 - }, - { - "__id__": 568 } ], "_prefab": { - "__id__": 570 + "__id__": 568 }, "_lpos": { "__type__": "cc.Vec3", @@ -11152,23 +11129,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 549 + "__id__": 547 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 549 + }, { "__id__": 551 }, { "__id__": 553 - }, - { - "__id__": 555 } ], "_prefab": { - "__id__": 557 + "__id__": 555 }, "_lpos": { "__type__": "cc.Vec3", @@ -11205,11 +11182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 550 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 550 }, "_contentSize": { "__type__": "cc.Size", @@ -11233,11 +11210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 550 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 554 + "__id__": 552 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11301,11 +11278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 550 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 556 + "__id__": 554 }, "_alignFlags": 1, "_target": null, @@ -11350,20 +11327,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 549 + "__id__": 547 }, "_children": [], "_active": true, "_components": [ { - "__id__": 559 + "__id__": 557 }, { - "__id__": 561 + "__id__": 559 } ], "_prefab": { - "__id__": 563 + "__id__": 561 }, "_lpos": { "__type__": "cc.Vec3", @@ -11400,11 +11377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 558 }, "_contentSize": { "__type__": "cc.Size", @@ -11428,11 +11405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 556 }, "_enabled": false, "__prefab": { - "__id__": 562 + "__id__": 560 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11509,11 +11486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 563 }, "_contentSize": { "__type__": "cc.Size", @@ -11537,11 +11514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 547 }, "_enabled": false, "__prefab": { - "__id__": 567 + "__id__": 565 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11585,11 +11562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 567 }, "_alignFlags": 17, "_target": null, @@ -11635,14 +11612,14 @@ "__id__": 167 }, "_prefab": { - "__id__": 572 + "__id__": 570 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 571 + "__id__": 569 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -11650,7 +11627,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 573 + "__id__": 571 }, "targetOverrides": null }, @@ -11663,18 +11640,21 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 572 + }, { "__id__": 574 }, + { + "__id__": 575 + }, { "__id__": 576 }, { "__id__": 577 }, - { - "__id__": 578 - }, { "__id__": 579 }, @@ -11682,10 +11662,7 @@ "__id__": 581 }, { - "__id__": 583 - }, - { - "__id__": 584 + "__id__": 582 } ], "removedComponents": [] @@ -11693,7 +11670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 573 }, "propertyPath": [ "_name" @@ -11709,7 +11686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 573 }, "propertyPath": [ "_lpos" @@ -11724,7 +11701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 573 }, "propertyPath": [ "_lrot" @@ -11740,7 +11717,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 573 }, "propertyPath": [ "_euler" @@ -11755,7 +11732,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 578 }, "propertyPath": [ "clickEvents", @@ -11772,14 +11749,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 578 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 582 + "__id__": 580 } }, { @@ -11795,19 +11772,19 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 578 }, "propertyPath": [ "_target" ], "value": { - "__id__": 571 + "__id__": 569 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 585 + "__id__": 583 }, "propertyPath": [ "_bottom" @@ -11830,29 +11807,29 @@ }, "_children": [ { - "__id__": 587 + "__id__": 585 }, { - "__id__": 595 + "__id__": 593 } ], "_active": false, "_components": [ + { + "__id__": 599 + }, { "__id__": 601 }, { - "__id__": 603 + "__id__": 604 }, { "__id__": 606 - }, - { - "__id__": 608 } ], "_prefab": { - "__id__": 610 + "__id__": 608 }, "_lpos": { "__type__": "cc.Vec3", @@ -11889,23 +11866,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 584 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 586 + }, { "__id__": 588 }, { "__id__": 590 - }, - { - "__id__": 592 } ], "_prefab": { - "__id__": 594 + "__id__": 592 }, "_lpos": { "__type__": "cc.Vec3", @@ -11942,11 +11919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 587 }, "_contentSize": { "__type__": "cc.Size", @@ -11970,11 +11947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 589 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12018,11 +11995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 591 }, "_alignFlags": 45, "_target": null, @@ -12067,20 +12044,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 586 + "__id__": 584 }, "_children": [], "_active": true, "_components": [ { - "__id__": 596 + "__id__": 594 }, { - "__id__": 598 + "__id__": 596 } ], "_prefab": { - "__id__": 600 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -12117,11 +12094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 593 }, "_enabled": true, "__prefab": { - "__id__": 597 + "__id__": 595 }, "_contentSize": { "__type__": "cc.Size", @@ -12145,11 +12122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 593 }, "_enabled": true, "__prefab": { - "__id__": 599 + "__id__": 597 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12226,11 +12203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 600 }, "_contentSize": { "__type__": "cc.Size", @@ -12254,15 +12231,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 602 }, "clickEvents": [ { - "__id__": 605 + "__id__": 603 } ], "_interactable": true, @@ -12302,7 +12279,7 @@ "_duration": 0.3, "_zoomScale": 1.3, "_target": { - "__id__": 586 + "__id__": 584 }, "_id": "" }, @@ -12326,11 +12303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 607 + "__id__": 605 }, "_alignFlags": 4, "_target": null, @@ -12362,11 +12339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 609 + "__id__": 607 }, "_id": "" }, @@ -12397,20 +12374,20 @@ }, "_children": [ { - "__id__": 612 + "__id__": 610 } ], "_active": false, "_components": [ { - "__id__": 618 + "__id__": 616 }, { - "__id__": 620 + "__id__": 618 } ], "_prefab": { - "__id__": 622 + "__id__": 620 }, "_lpos": { "__type__": "cc.Vec3", @@ -12447,20 +12424,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 611 + "__id__": 609 }, "_children": [], "_active": true, "_components": [ { - "__id__": 613 + "__id__": 611 }, { - "__id__": 615 + "__id__": 613 } ], "_prefab": { - "__id__": 617 + "__id__": 615 }, "_lpos": { "__type__": "cc.Vec3", @@ -12497,11 +12474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 612 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 612 }, "_contentSize": { "__type__": "cc.Size", @@ -12525,11 +12502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 612 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 614 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12583,11 +12560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 611 + "__id__": 609 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 617 }, "_contentSize": { "__type__": "cc.Size", @@ -12611,11 +12588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 611 + "__id__": 609 }, "_enabled": true, "__prefab": { - "__id__": 621 + "__id__": 619 }, "playOnLoad": true, "_clips": [ @@ -12657,23 +12634,23 @@ }, "_children": [ { - "__id__": 624 + "__id__": 622 } ], "_active": true, "_components": [ + { + "__id__": 630 + }, { "__id__": 632 }, { - "__id__": 634 - }, - { - "__id__": 637 + "__id__": 635 } ], "_prefab": { - "__id__": 639 + "__id__": 637 }, "_lpos": { "__type__": "cc.Vec3", @@ -12710,23 +12687,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 623 + "__id__": 621 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 623 + }, { "__id__": 625 }, { "__id__": 627 - }, - { - "__id__": 629 } ], "_prefab": { - "__id__": 631 + "__id__": 629 }, "_lpos": { "__type__": "cc.Vec3", @@ -12763,11 +12740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 624 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 626 + "__id__": 624 }, "_contentSize": { "__type__": "cc.Size", @@ -12791,11 +12768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 624 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 626 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12839,11 +12816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 624 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 628 }, "_alignFlags": 45, "_target": null, @@ -12888,11 +12865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 623 + "__id__": 621 }, "_enabled": true, "__prefab": { - "__id__": 633 + "__id__": 631 }, "_contentSize": { "__type__": "cc.Size", @@ -12916,15 +12893,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 623 + "__id__": 621 }, "_enabled": true, "__prefab": { - "__id__": 635 + "__id__": 633 }, "clickEvents": [ { - "__id__": 636 + "__id__": 634 } ], "_interactable": true, @@ -12964,7 +12941,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 623 + "__id__": 621 }, "_id": "" }, @@ -12988,11 +12965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 623 + "__id__": 621 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 636 }, "_alignFlags": 4, "_target": null, @@ -13041,23 +13018,23 @@ }, "_children": [ { - "__id__": 641 + "__id__": 639 } ], "_active": true, "_components": [ + { + "__id__": 647 + }, { "__id__": 649 }, { - "__id__": 651 - }, - { - "__id__": 654 + "__id__": 652 } ], "_prefab": { - "__id__": 656 + "__id__": 654 }, "_lpos": { "__type__": "cc.Vec3", @@ -13094,23 +13071,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 640 + "__id__": 638 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 640 + }, { "__id__": 642 }, { "__id__": 644 - }, - { - "__id__": 646 } ], "_prefab": { - "__id__": 648 + "__id__": 646 }, "_lpos": { "__type__": "cc.Vec3", @@ -13147,11 +13124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 639 }, "_enabled": true, "__prefab": { - "__id__": 643 + "__id__": 641 }, "_contentSize": { "__type__": "cc.Size", @@ -13175,11 +13152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 639 }, "_enabled": true, "__prefab": { - "__id__": 645 + "__id__": 643 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13223,11 +13200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 639 }, "_enabled": true, "__prefab": { - "__id__": 647 + "__id__": 645 }, "_alignFlags": 45, "_target": null, @@ -13272,11 +13249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 650 + "__id__": 648 }, "_contentSize": { "__type__": "cc.Size", @@ -13300,15 +13277,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 650 }, "clickEvents": [ { - "__id__": 653 + "__id__": 651 } ], "_interactable": true, @@ -13348,7 +13325,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 640 + "__id__": 638 }, "_id": "" }, @@ -13372,11 +13349,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 655 + "__id__": 653 }, "_alignFlags": 4, "_target": null, @@ -13425,7 +13402,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 656 }, "_contentSize": { "__type__": "cc.Size", @@ -13453,7 +13430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 658 }, "_alignFlags": 21, "_target": null, @@ -13489,7 +13466,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 660 }, "_id": "" }, @@ -13507,7 +13484,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 662 }, "_id": "" }, @@ -13538,26 +13515,26 @@ }, "_children": [ { - "__id__": 667 + "__id__": 665 }, { - "__id__": 675 + "__id__": 673 } ], "_active": false, "_components": [ + { + "__id__": 685 + }, { "__id__": 687 }, { "__id__": 689 - }, - { - "__id__": 691 } ], "_prefab": { - "__id__": 693 + "__id__": 691 }, "_lpos": { "__type__": "cc.Vec3", @@ -13594,23 +13571,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 666 + "__id__": 664 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 666 + }, { "__id__": 668 }, { "__id__": 670 - }, - { - "__id__": 672 } ], "_prefab": { - "__id__": 674 + "__id__": 672 }, "_lpos": { "__type__": "cc.Vec3", @@ -13647,11 +13624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 667 }, "_contentSize": { "__type__": "cc.Size", @@ -13675,11 +13652,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 669 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13723,11 +13700,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 673 + "__id__": 671 }, "_alignFlags": 45, "_target": null, @@ -13770,17 +13747,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 666 + "__id__": 664 }, "_prefab": { - "__id__": 676 + "__id__": 674 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 675 + "__id__": 673 }, "asset": { "__uuid__": "9cc71d8c-192a-4234-8204-352f42b95c65", @@ -13788,7 +13765,7 @@ }, "fileId": "a0daVw8DRLi6ToMaTA0VS2", "instance": { - "__id__": 677 + "__id__": 675 }, "targetOverrides": null }, @@ -13801,23 +13778,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 676 + }, { "__id__": 678 }, + { + "__id__": 679 + }, { "__id__": 680 }, { "__id__": 681 }, - { - "__id__": 682 - }, { "__id__": 683 - }, - { - "__id__": 685 } ], "removedComponents": [] @@ -13825,7 +13802,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 679 + "__id__": 677 }, "propertyPath": [ "_name" @@ -13841,7 +13818,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 679 + "__id__": 677 }, "propertyPath": [ "_lpos" @@ -13856,7 +13833,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 679 + "__id__": 677 }, "propertyPath": [ "_lrot" @@ -13872,7 +13849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 679 + "__id__": 677 }, "propertyPath": [ "_euler" @@ -13887,7 +13864,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 682 }, "propertyPath": [ "_contentSize" @@ -13907,7 +13884,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 686 + "__id__": 684 }, "propertyPath": [ "_contentSize" @@ -13930,11 +13907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 664 }, "_enabled": true, "__prefab": { - "__id__": 688 + "__id__": 686 }, "_contentSize": { "__type__": "cc.Size", @@ -13958,11 +13935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 664 }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 688 }, "_alignFlags": 45, "_target": null, @@ -13994,11 +13971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 664 }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 690 }, "_id": "" }, @@ -14029,23 +14006,23 @@ }, "_children": [ { - "__id__": 695 + "__id__": 693 } ], "_active": true, "_components": [ + { + "__id__": 731 + }, { "__id__": 733 }, { "__id__": 735 - }, - { - "__id__": 737 } ], "_prefab": { - "__id__": 739 + "__id__": 737 }, "_lpos": { "__type__": "cc.Vec3", @@ -14082,15 +14059,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 694 + "__id__": 692 }, "_children": [ { - "__id__": 696 + "__id__": 694 } ], "_active": true, "_components": [ + { + "__id__": 722 + }, { "__id__": 724 }, @@ -14099,13 +14079,10 @@ }, { "__id__": 728 - }, - { - "__id__": 730 } ], "_prefab": { - "__id__": 732 + "__id__": 730 }, "_lpos": { "__type__": "cc.Vec3", @@ -14142,27 +14119,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 695 + "__id__": 693 }, "_children": [ { - "__id__": 697 + "__id__": 695 }, { - "__id__": 705 + "__id__": 703 }, { - "__id__": 711 + "__id__": 709 } ], "_active": true, "_components": [ { - "__id__": 721 + "__id__": 719 } ], "_prefab": { - "__id__": 723 + "__id__": 721 }, "_lpos": { "__type__": "cc.Vec3", @@ -14199,23 +14176,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 694 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 696 + }, { "__id__": 698 }, { "__id__": 700 - }, - { - "__id__": 702 } ], "_prefab": { - "__id__": 704 + "__id__": 702 }, "_lpos": { "__type__": "cc.Vec3", @@ -14252,11 +14229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 699 + "__id__": 697 }, "_contentSize": { "__type__": "cc.Size", @@ -14280,11 +14257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 699 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14328,11 +14305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 703 + "__id__": 701 }, "_alignFlags": 40, "_target": null, @@ -14377,20 +14354,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 694 }, "_children": [], "_active": true, "_components": [ { - "__id__": 706 + "__id__": 704 }, { - "__id__": 708 + "__id__": 706 } ], "_prefab": { - "__id__": 710 + "__id__": 708 }, "_lpos": { "__type__": "cc.Vec3", @@ -14427,11 +14404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 705 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 707 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -14455,11 +14432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 705 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 709 + "__id__": 707 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14516,11 +14493,14 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 694 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 710 + }, { "__id__": 712 }, @@ -14529,13 +14509,10 @@ }, { "__id__": 716 - }, - { - "__id__": 718 } ], "_prefab": { - "__id__": 720 + "__id__": 718 }, "_lpos": { "__type__": "cc.Vec3", @@ -14572,11 +14549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 711 }, "_contentSize": { "__type__": "cc.Size", @@ -14600,11 +14577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 715 + "__id__": 713 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14668,11 +14645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 717 + "__id__": 715 }, "_alignFlags": 10, "_target": null, @@ -14704,11 +14681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 719 + "__id__": 717 }, "templateMode": true, "watchPath": "data.data.gold", @@ -14741,11 +14718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 722 + "__id__": 720 }, "_contentSize": { "__type__": "cc.Size", @@ -14782,11 +14759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 725 + "__id__": 723 }, "_contentSize": { "__type__": "cc.Size", @@ -14810,11 +14787,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 725 }, "_alignFlags": 8, "_target": null, @@ -14846,11 +14823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 729 + "__id__": 727 }, "_resizeMode": 0, "_layoutType": 1, @@ -14884,11 +14861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 729 }, "_alignFlags": 40, "_target": null, @@ -14933,11 +14910,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 694 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 734 + "__id__": 732 }, "_contentSize": { "__type__": "cc.Size", @@ -14961,11 +14938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 694 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 736 + "__id__": 734 }, "_alignFlags": 17, "_target": null, @@ -14997,11 +14974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 694 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 738 + "__id__": 736 }, "_id": "" }, @@ -15032,7 +15009,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 741 + "__id__": 739 }, "_contentSize": { "__type__": "cc.Size", @@ -15060,7 +15037,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 741 }, "_alignFlags": 45, "_target": null, @@ -15096,7 +15073,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 745 + "__id__": 743 }, "_id": "" }, @@ -15116,33 +15093,33 @@ "instance": null, "targetOverrides": [ { - "__id__": 747 + "__id__": 745 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 675 + "__id__": 673 }, { - "__id__": 571 + "__id__": 569 }, { - "__id__": 436 + "__id__": 434 }, { - "__id__": 391 + "__id__": 389 }, { - "__id__": 348 + "__id__": 346 }, { - "__id__": 301 + "__id__": 299 }, { - "__id__": 258 + "__id__": 256 }, { - "__id__": 215 + "__id__": 213 }, { "__id__": 192 @@ -15152,15 +15129,15 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 306 + "__id__": 304 }, "sourceInfo": null, "propertyPath": [], "target": { - "__id__": 301 + "__id__": 299 }, "targetInfo": { - "__id__": 748 + "__id__": 746 } }, { diff --git a/assets/resources/gui/ubgs.plist.meta b/assets/resources/gui/ubgs.plist.meta index 55c3191e..16c89085 100644 --- a/assets/resources/gui/ubgs.plist.meta +++ b/assets/resources/gui/ubgs.plist.meta @@ -18,8 +18,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 100, - "trimY": 1596, + "trimX": 376, + "trimY": 1567, "width": 26, "height": 18, "rawWidth": 26, @@ -110,8 +110,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 100, - "trimY": 1616, + "trimX": 143, + "trimY": 1617, "width": 4, "height": 18, "rawWidth": 4, @@ -156,8 +156,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 296, - "trimY": 1559, + "trimX": 623, + "trimY": 1531, "width": 17, "height": 16, "rawWidth": 17, @@ -202,8 +202,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 39, - "trimY": 1596, + "trimX": 503, + "trimY": 1537, "width": 16, "height": 24, "rawWidth": 16, @@ -248,8 +248,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 314, - "trimY": 1559, + "trimX": 624, + "trimY": 1497, "width": 17, "height": 16, "rawWidth": 17, @@ -340,8 +340,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 260, - "trimY": 1497, + "trimX": 508, + "trimY": 1563, "width": 60, "height": 60, "rawWidth": 60, @@ -386,8 +386,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 322, - "trimY": 1497, + "trimX": 570, + "trimY": 1563, "width": 60, "height": 60, "rawWidth": 60, @@ -432,8 +432,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 384, - "trimY": 1497, + "trimX": 404, + "trimY": 1567, "width": 54, "height": 54, "rawWidth": 54, @@ -478,8 +478,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 494, - "trimY": 1497, + "trimX": 460, + "trimY": 1565, "width": 46, "height": 46, "rawWidth": 48, @@ -524,8 +524,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 542, - "trimY": 1497, + "trimX": 632, + "trimY": 1550, "width": 46, "height": 46, "rawWidth": 48, @@ -570,7 +570,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 590, + "trimX": 648, "trimY": 1497, "width": 46, "height": 46, @@ -616,16 +616,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 638, - "trimY": 1497, + "trimX": 680, + "trimY": 1545, "width": 46, "height": 46, "rawWidth": 48, "rawHeight": 48, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 23, + "borderBottom": 23, + "borderLeft": 23, + "borderRight": 23, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -662,8 +662,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 21, - "trimY": 1596, + "trimX": 485, + "trimY": 1537, "width": 16, "height": 24, "rawWidth": 16, @@ -708,8 +708,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 510, - "trimY": 1545, + "trimX": 370, + "trimY": 1591, "width": 32, "height": 32, "rawWidth": 32, @@ -754,8 +754,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 118, - "trimY": 1497, + "trimX": 1, + "trimY": 1537, "width": 140, "height": 83, "rawWidth": 140, @@ -800,8 +800,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 384, - "trimY": 1553, + "trimX": 447, + "trimY": 1537, "width": 36, "height": 26, "rawWidth": 36, @@ -846,8 +846,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 422, - "trimY": 1553, + "trimX": 266, + "trimY": 1597, "width": 25, "height": 50, "rawWidth": 25, @@ -889,11 +889,11 @@ "name": "Slider_Border_Tapered_01_Fill_Orange", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 440, - "trimY": 1497, + "trimX": 295, + "trimY": 1567, "width": 25, "height": 50, "rawWidth": 25, @@ -935,11 +935,11 @@ "name": "Slider_Border_Tapered_01_Fill_Sky", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 467, - "trimY": 1497, + "trimX": 318, + "trimY": 1594, "width": 25, "height": 50, "rawWidth": 25, @@ -984,8 +984,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 642, - "trimY": 1545, + "trimX": 143, + "trimY": 1537, "width": 150, "height": 28, "rawWidth": 150, @@ -1030,8 +1030,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 686, - "trimY": 1497, + "trimX": 143, + "trimY": 1567, "width": 150, "height": 28, "rawWidth": 150, @@ -1073,11 +1073,11 @@ "name": "Slider_Border_Tapered_02_Fill_Yellow", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 781, - "trimY": 1113, + "trimX": 295, + "trimY": 1537, "width": 150, "height": 28, "rawWidth": 150, @@ -1119,11 +1119,11 @@ "name": "Slider_Border_Tapered_03_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 785, - "trimY": 1575, + "trimX": 514, + "trimY": 1497, "width": 40, "height": 36, "rawWidth": 40, @@ -1165,11 +1165,11 @@ "name": "Slider_Border_Tapered_03_Fill", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 86, - "trimY": 1596, + "trimX": 624, + "trimY": 1516, "width": 12, "height": 22, "rawWidth": 12, @@ -1214,8 +1214,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 57, - "trimY": 1596, + "trimX": 347, + "trimY": 1567, "width": 27, "height": 22, "rawWidth": 27, @@ -1260,8 +1260,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 474, - "trimY": 1549, + "trimX": 557, + "trimY": 1531, "width": 34, "height": 30, "rawWidth": 34, @@ -1306,8 +1306,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 260, - "trimY": 1559, + "trimX": 521, + "trimY": 1535, "width": 17, "height": 16, "rawWidth": 17, @@ -1352,8 +1352,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 278, - "trimY": 1559, + "trimX": 539, + "trimY": 1535, "width": 17, "height": 16, "rawWidth": 17, @@ -1398,8 +1398,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 120, - "trimY": 1616, + "trimX": 163, + "trimY": 1617, "width": 4, "height": 18, "rawWidth": 4, @@ -1444,8 +1444,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 699, - "trimY": 1575, + "trimX": 469, + "trimY": 1113, "width": 41, "height": 44, "rawWidth": 41, @@ -1490,8 +1490,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 742, - "trimY": 1575, + "trimX": 469, + "trimY": 1159, "width": 41, "height": 44, "rawWidth": 41, @@ -1536,8 +1536,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 612, - "trimY": 1545, + "trimX": 593, + "trimY": 1531, "width": 28, "height": 29, "rawWidth": 28, @@ -1582,8 +1582,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 544, - "trimY": 1545, + "trimX": 556, + "trimY": 1497, "width": 32, "height": 32, "rawWidth": 32, @@ -1617,6 +1617,52 @@ ], "subMetas": {} }, + "ca3ab": { + "importer": "sprite-frame", + "uuid": "ab41374b-398e-499c-8501-75493c8ff83e@ca3ab", + "displayName": "", + "id": "ca3ab", + "name": "Window", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 469, + "trimY": 1205, + "width": 40, + "height": 40, + "rawWidth": 48, + "rawHeight": 48, + "borderTop": 20, + "borderBottom": 20, + "borderLeft": 20, + "borderRight": 20, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "82ba42b7-4bc5-4d63-9417-96dc6c255731@6c48a", + "atlasUuid": "ab41374b-398e-499c-8501-75493c8ff83e", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "8e66b": { "importer": "sprite-frame", "uuid": "ab41374b-398e-499c-8501-75493c8ff83e@8e66b", @@ -1628,16 +1674,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 653, - "trimY": 1575, + "trimX": 696, + "trimY": 1497, "width": 44, "height": 44, "rawWidth": 48, "rawHeight": 48, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 22, + "borderBottom": 22, + "borderLeft": 22, + "borderRight": 22, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1674,8 +1720,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 578, - "trimY": 1545, + "trimX": 590, + "trimY": 1497, "width": 32, "height": 32, "rawWidth": 32, @@ -1717,11 +1763,11 @@ "name": "bar1", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1497, + "trimX": 143, + "trimY": 1597, "width": 121, "height": 18, "rawWidth": 121, @@ -1766,8 +1812,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 140, - "trimY": 1582, + "trimX": 1, + "trimY": 1497, "width": 511, "height": 38, "rawWidth": 511, @@ -1858,7 +1904,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 469, + "trimX": 313, "trimY": 1113, "width": 154, "height": 382, @@ -1904,7 +1950,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 625, + "trimX": 670, "trimY": 1113, "width": 154, "height": 382, @@ -1950,7 +1996,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 21, + "trimX": 742, "trimY": 1497, "width": 95, "height": 97, @@ -1996,7 +2042,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 838, + "trimX": 826, "trimY": 1113, "width": 162, "height": 240, @@ -2042,7 +2088,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 838, + "trimX": 826, "trimY": 1277, "width": 162, "height": 240, @@ -2088,7 +2134,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 838, + "trimX": 839, "trimY": 1441, "width": 161, "height": 237, @@ -2134,7 +2180,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 157, + "trimX": 514, "trimY": 1113, "width": 154, "height": 382, @@ -2180,7 +2226,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 313, + "trimX": 157, "trimY": 1113, "width": 154, "height": 382, diff --git a/assets/resources/gui/uis/bgs/bg_info.prefab b/assets/resources/gui/uis/bgs/bg_info.prefab index e4ff7a94..13306056 100644 --- a/assets/resources/gui/uis/bgs/bg_info.prefab +++ b/assets/resources/gui/uis/bgs/bg_info.prefab @@ -71,7 +71,7 @@ }, { "__type__": "cc.Node", - "_name": "BaseFrame_Border_Rectangle_H60_Bg", + "_name": "Bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 5, + "y": 5, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 825, - "height": 187.5 + "width": 360, + "height": 640 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 83, - "g": 81, - "b": 81, + "r": 148, + "g": 148, + "b": 148, "a": 255 }, "_spriteFrame": { - "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@c3210", + "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@ca3ab", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -188,7 +188,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -246,7 +249,7 @@ }, { "__type__": "cc.Node", - "_name": "BaseFrame_Border_Rectangle_H60_Border", + "_name": "Border", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -283,8 +286,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 5, + "y": 5, "z": 1 }, "_mobility": 0, @@ -311,8 +314,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 825, - "height": 187.5 + "width": 360, + "height": 640 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -342,13 +345,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@6e2e8", + "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@8e66b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -363,7 +366,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -421,7 +427,7 @@ }, { "__type__": "cc.Node", - "_name": "BaseFrame_Border_Rectangle_H60_DecoLine", + "_name": "CornersSilver", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -458,8 +464,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 5, + "y": 5, "z": 1 }, "_mobility": 0, @@ -486,8 +492,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 805, - "height": 167.5 + "width": 360, + "height": 640 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -498,7 +504,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fbeQHbeipFY7ExzedhFNLM" + "fileId": "1033MU6eBKWJm2yvPLdAu0" }, { "__type__": "cc.Sprite", @@ -517,13 +523,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 182, - "g": 182, - "b": 182, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@fbeff", + "__uuid__": "ab41374b-398e-499c-8501-75493c8ff83e@b50f2", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -543,7 +549,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccp5/zHVZB3pcnuk2PVY8s" + "fileId": "a4IfOCCsRJRJ4DVgetI+wc" }, { "__type__": "cc.Widget", @@ -559,10 +565,10 @@ }, "_alignFlags": 45, "_target": null, - "_left": 10, - "_right": 10, - "_top": 10, - "_bottom": 10, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -571,15 +577,15 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 54, - "_originalHeight": 54, + "_originalWidth": 46, + "_originalHeight": 46, "_alignMode": 2, "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "70pduWDClGF6JcbdW5pmZE" + "fileId": "f9LvExhctNUqDhUqA0wn7n" }, { "__type__": "cc.PrefabInfo", @@ -589,7 +595,7 @@ "asset": { "__id__": 0 }, - "fileId": "beOOI7i7NFaqr0T9a9N6d2", + "fileId": "43P0gFGJBAiYf55DlpmNdV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -608,8 +614,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 825, - "height": 187.5 + "width": 1800, + "height": 3200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -667,6 +673,7 @@ "__id__": 0 }, "fileId": "05DREFeeFN3J6MVw6Ib9Zw", + "instance": null, "targetOverrides": null } ] \ No newline at end of file