From a6915fdf008e2130c7b4f2c4230a0df62bdc9a5f Mon Sep 17 00:00:00 2001 From: panw Date: Fri, 15 May 2026 15:44:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor(LangUtil):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 将原有的字符串LangPrefix类型改为枚举类型,避免硬编码字符串错误 2. 更新所有使用处的调用方式,统一使用LangPrefix枚举来传入多语言前缀 3. 移除VictoryComp中硬编码的成就描述拼接逻辑,改用lang/langf方法获取多语言文本 4. 注释暂时不需要渲染的分数进度条代码 --- assets/resources/gui/element/victory.prefab | 3115 +++++++++-------- assets/script/game/common/LangUtil.ts | 59 +- assets/script/game/common/LangUtil.ts.meta | 9 + .../script/game/common/config/HighlightSet.ts | 6 +- assets/script/game/map/VictoryComp.ts | 44 +- 5 files changed, 1712 insertions(+), 1521 deletions(-) create mode 100644 assets/script/game/common/LangUtil.ts.meta diff --git a/assets/resources/gui/element/victory.prefab b/assets/resources/gui/element/victory.prefab index 59c364f9..e9e14e9b 100644 --- a/assets/resources/gui/element/victory.prefab +++ b/assets/resources/gui/element/victory.prefab @@ -28,32 +28,32 @@ "__id__": 24 }, { - "__id__": 837 + "__id__": 845 }, { - "__id__": 890 + "__id__": 898 } ], "_active": true, "_components": [ - { - "__id__": 903 - }, - { - "__id__": 905 - }, - { - "__id__": 907 - }, - { - "__id__": 909 - }, { "__id__": 911 + }, + { + "__id__": 913 + }, + { + "__id__": 915 + }, + { + "__id__": 917 + }, + { + "__id__": 919 } ], "_prefab": { - "__id__": 913 + "__id__": 921 }, "_lpos": { "__type__": "cc.Vec3", @@ -419,7 +419,7 @@ "b": 255, "a": 255 }, - "_string": "战斗结算", + "_string": "战斗结束", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 35, @@ -615,9 +615,6 @@ { "__id__": 255 }, - { - "__id__": 305 - }, { "__id__": 313 }, @@ -625,23 +622,26 @@ "__id__": 321 }, { - "__id__": 798 + "__id__": 329 }, { - "__id__": 804 + "__id__": 806 + }, + { + "__id__": 812 } ], "_active": true, "_components": [ { - "__id__": 832 + "__id__": 840 }, { - "__id__": 834 + "__id__": 842 } ], "_prefab": { - "__id__": 836 + "__id__": 844 }, "_lpos": { "__type__": "cc.Vec3", @@ -697,7 +697,7 @@ "__id__": 202 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 246 @@ -6022,25 +6022,25 @@ "__id__": 256 }, { - "__id__": 278 + "__id__": 286 } ], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 308 }, { - "__id__": 302 + "__id__": 310 } ], "_prefab": { - "__id__": 304 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", - "x": -146.286, - "y": 309.257, + "x": 0, + "y": 19.046, "z": 0 }, "_lrot": { @@ -6077,26 +6077,29 @@ "_children": [ { "__id__": 257 + }, + { + "__id__": 271 } ], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 279 }, { - "__id__": 273 + "__id__": 281 }, { - "__id__": 275 + "__id__": 283 } ], "_prefab": { - "__id__": 277 + "__id__": 285 }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, + "x": 30, "y": 0, "z": 0 }, @@ -6454,6 +6457,202 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 256 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 272 + }, + { + "__id__": 274 + }, + { + "__id__": 276 + } + ], + "_prefab": { + "__id__": 278 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -136.035, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 271 + }, + "_enabled": true, + "__prefab": { + "__id__": 273 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150, + "height": 100.8 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31xAlj7lpMBqfxEztP1+F0" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 271 + }, + "_enabled": true, + "__prefab": { + "__id__": 275 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "得分:", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 50, + "_fontSize": 50, + "_fontFamily": "Arial", + "_lineHeight": 80, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93Fa9tuOZNo61dcDGB3+P3" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 271 + }, + "_enabled": true, + "__prefab": { + "__id__": 277 + }, + "_alignFlags": 8, + "_target": null, + "_left": -125.6121484375, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d41UiwnBNAr7uSDJYEcCIz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "28sWVd6AVGOI5O4rPSSn3f", + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -6464,12 +6663,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 50.4 + "width": 170.845703125, + "height": 104.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6492,7 +6691,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 282 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6507,17 +6706,17 @@ "_string": "99999", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 31, - "_fontSize": 30, + "_actualFontSize": 60, + "_fontSize": 60, "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 2, + "_lineHeight": 80, + "_overflow": 0, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, "_spacingX": 0, - "_isItalic": true, - "_isBold": false, + "_isItalic": false, + "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, @@ -6560,15 +6759,15 @@ }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 284 }, - "_alignFlags": 8, + "_alignFlags": 16, "_target": null, - "_left": 0, + "_left": 96.3771484375, "_right": 118.8720703125, "_top": 0, "_bottom": 0, - "_horizontalCenter": 0, + "_horizontalCenter": 30, "_verticalCenter": 0, "_isAbsLeft": true, "_isAbsRight": true, @@ -6609,26 +6808,26 @@ }, "_children": [ { - "__id__": 279 + "__id__": 287 }, { - "__id__": 285 + "__id__": 293 } ], "_active": false, "_components": [ { - "__id__": 293 + "__id__": 301 }, { - "__id__": 295 + "__id__": 303 }, { - "__id__": 297 + "__id__": 305 } ], "_prefab": { - "__id__": 299 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", @@ -6665,20 +6864,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 286 }, "_children": [], "_active": true, "_components": [ { - "__id__": 280 + "__id__": 288 }, { - "__id__": 282 + "__id__": 290 } ], "_prefab": { - "__id__": 284 + "__id__": 292 }, "_lpos": { "__type__": "cc.Vec3", @@ -6715,11 +6914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 287 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 289 }, "_contentSize": { "__type__": "cc.Size", @@ -6743,11 +6942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 287 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 291 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6804,23 +7003,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 286 }, "_children": [], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 294 }, { - "__id__": 288 + "__id__": 296 }, { - "__id__": 290 + "__id__": 298 } ], "_prefab": { - "__id__": 292 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -6857,11 +7056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -6885,11 +7084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6930,11 +7129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 285 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 299 }, "_alignFlags": 45, "_target": null, @@ -6979,11 +7178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -7007,11 +7206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 286 }, "_enabled": false, "__prefab": { - "__id__": 296 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7055,14 +7254,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 306 }, "_barSprite": { - "__id__": 282 + "__id__": 290 }, "_mode": 0, "_totalLength": 300, @@ -7097,7 +7296,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -7125,12 +7324,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 311 }, "_alignFlags": 40, "_target": null, - "_left": 33.71400000000028, - "_right": 326.2860000000003, + "_left": 180.00000000000028, + "_right": 180.00000000000028, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -7176,17 +7375,17 @@ "_active": true, "_components": [ { - "__id__": 306 + "__id__": 314 }, { - "__id__": 308 + "__id__": 316 }, { - "__id__": 310 + "__id__": 318 } ], "_prefab": { - "__id__": 312 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -7223,11 +7422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -7251,11 +7450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 313 }, "_enabled": false, "__prefab": { - "__id__": 309 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7296,11 +7495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 319 }, "_alignFlags": 45, "_target": null, @@ -7351,17 +7550,17 @@ "_active": false, "_components": [ { - "__id__": 314 + "__id__": 322 }, { - "__id__": 316 + "__id__": 324 }, { - "__id__": 318 + "__id__": 326 } ], "_prefab": { - "__id__": 320 + "__id__": 328 }, "_lpos": { "__type__": "cc.Vec3", @@ -7398,11 +7597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -7426,11 +7625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7471,11 +7670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 327 }, "_alignFlags": 1, "_target": null, @@ -7524,34 +7723,34 @@ }, "_children": [ { - "__id__": 322 + "__id__": 330 }, { - "__id__": 328 + "__id__": 336 }, { - "__id__": 334 + "__id__": 342 } ], "_active": true, "_components": [ { - "__id__": 791 + "__id__": 799 }, { - "__id__": 793 + "__id__": 801 }, { - "__id__": 795 + "__id__": 803 } ], "_prefab": { - "__id__": 797 + "__id__": 805 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 106.286, + "y": 275.327, "z": 0 }, "_lrot": { @@ -7583,20 +7782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 329 }, "_children": [], "_active": true, "_components": [ { - "__id__": 323 + "__id__": 331 }, { - "__id__": 325 + "__id__": 333 } ], "_prefab": { - "__id__": 327 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", @@ -7633,11 +7832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 332 }, "_contentSize": { "__type__": "cc.Size", @@ -7661,11 +7860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 334 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7719,20 +7918,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 329 }, "_children": [], "_active": true, "_components": [ { - "__id__": 329 + "__id__": 337 }, { - "__id__": 331 + "__id__": 339 } ], "_prefab": { - "__id__": 333 + "__id__": 341 }, "_lpos": { "__type__": "cc.Vec3", @@ -7769,11 +7968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -7797,11 +7996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 340 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7855,14 +8054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 329 }, "_children": [ { - "__id__": 335 - }, - { - "__id__": 419 + "__id__": 343 }, { "__id__": 427 @@ -7871,32 +8067,35 @@ "__id__": 435 }, { - "__id__": 506 + "__id__": 443 }, { - "__id__": 528 + "__id__": 514 }, { - "__id__": 558 + "__id__": 536 }, { - "__id__": 720 + "__id__": 566 }, { - "__id__": 748 + "__id__": 728 }, { - "__id__": 776 + "__id__": 756 + }, + { + "__id__": 784 } ], "_active": true, "_components": [ { - "__id__": 788 + "__id__": 796 } ], "_prefab": { - "__id__": 790 + "__id__": 798 }, "_lpos": { "__type__": "cc.Vec3", @@ -7933,39 +8132,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ - { - "__id__": 336 - }, { "__id__": 344 }, { - "__id__": 358 + "__id__": 352 }, { - "__id__": 372 + "__id__": 366 }, { - "__id__": 386 + "__id__": 380 }, { - "__id__": 400 + "__id__": 394 + }, + { + "__id__": 408 } ], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 422 }, { - "__id__": 416 + "__id__": 424 } ], "_prefab": { - "__id__": 418 + "__id__": 426 }, "_lpos": { "__type__": "cc.Vec3", @@ -8002,23 +8201,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [], "_active": false, "_components": [ { - "__id__": 337 + "__id__": 345 }, { - "__id__": 339 + "__id__": 347 }, { - "__id__": 341 + "__id__": 349 } ], "_prefab": { - "__id__": 343 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -8055,11 +8254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 346 }, "_contentSize": { "__type__": "cc.Size", @@ -8083,11 +8282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 348 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8131,11 +8330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 350 }, "_alignFlags": 45, "_target": null, @@ -8180,27 +8379,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [ { - "__id__": 345 + "__id__": 353 } ], "_active": false, "_components": [ { - "__id__": 351 + "__id__": 359 }, { - "__id__": 353 + "__id__": 361 }, { - "__id__": 355 + "__id__": 363 } ], "_prefab": { - "__id__": 357 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -8237,20 +8436,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 344 + "__id__": 352 }, "_children": [], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 354 }, { - "__id__": 348 + "__id__": 356 } ], "_prefab": { - "__id__": 350 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -8287,11 +8486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -8315,11 +8514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8376,11 +8575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -8404,11 +8603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 362 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8452,11 +8651,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 352 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 364 }, "_alignFlags": 45, "_target": null, @@ -8501,27 +8700,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [ { - "__id__": 359 + "__id__": 367 } ], "_active": true, "_components": [ { - "__id__": 365 + "__id__": 373 }, { - "__id__": 367 + "__id__": 375 }, { - "__id__": 369 + "__id__": 377 } ], "_prefab": { - "__id__": 371 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -8558,20 +8757,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 358 + "__id__": 366 }, "_children": [], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 368 }, { - "__id__": 362 + "__id__": 370 } ], "_prefab": { - "__id__": 364 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -8608,11 +8807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 367 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 369 }, "_contentSize": { "__type__": "cc.Size", @@ -8636,11 +8835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 359 + "__id__": 367 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 371 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8697,11 +8896,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", @@ -8725,11 +8924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 376 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8773,11 +8972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 358 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 378 }, "_alignFlags": 45, "_target": null, @@ -8822,27 +9021,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [ { - "__id__": 373 + "__id__": 381 } ], "_active": false, "_components": [ { - "__id__": 379 + "__id__": 387 }, { - "__id__": 381 + "__id__": 389 }, { - "__id__": 383 + "__id__": 391 } ], "_prefab": { - "__id__": 385 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", @@ -8879,20 +9078,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 372 + "__id__": 380 }, "_children": [], "_active": true, "_components": [ { - "__id__": 374 + "__id__": 382 }, { - "__id__": 376 + "__id__": 384 } ], "_prefab": { - "__id__": 378 + "__id__": 386 }, "_lpos": { "__type__": "cc.Vec3", @@ -8929,11 +9128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -8957,11 +9156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 385 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9018,11 +9217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 388 }, "_contentSize": { "__type__": "cc.Size", @@ -9046,11 +9245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 390 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9094,11 +9293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 392 }, "_alignFlags": 45, "_target": null, @@ -9143,27 +9342,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [ { - "__id__": 387 + "__id__": 395 } ], "_active": true, "_components": [ { - "__id__": 393 + "__id__": 401 }, { - "__id__": 395 + "__id__": 403 }, { - "__id__": 397 + "__id__": 405 } ], "_prefab": { - "__id__": 399 + "__id__": 407 }, "_lpos": { "__type__": "cc.Vec3", @@ -9200,20 +9399,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 386 + "__id__": 394 }, "_children": [], "_active": true, "_components": [ { - "__id__": 388 + "__id__": 396 }, { - "__id__": 390 + "__id__": 398 } ], "_prefab": { - "__id__": 392 + "__id__": 400 }, "_lpos": { "__type__": "cc.Vec3", @@ -9250,11 +9449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 397 }, "_contentSize": { "__type__": "cc.Size", @@ -9278,11 +9477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 399 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9339,11 +9538,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 402 }, "_contentSize": { "__type__": "cc.Size", @@ -9367,11 +9566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 404 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9415,11 +9614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 406 }, "_alignFlags": 45, "_target": null, @@ -9464,27 +9663,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 335 + "__id__": 343 }, "_children": [ { - "__id__": 401 + "__id__": 409 } ], "_active": false, "_components": [ { - "__id__": 407 + "__id__": 415 }, { - "__id__": 409 + "__id__": 417 }, { - "__id__": 411 + "__id__": 419 } ], "_prefab": { - "__id__": 413 + "__id__": 421 }, "_lpos": { "__type__": "cc.Vec3", @@ -9521,20 +9720,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 400 + "__id__": 408 }, "_children": [], "_active": true, "_components": [ { - "__id__": 402 + "__id__": 410 }, { - "__id__": 404 + "__id__": 412 } ], "_prefab": { - "__id__": 406 + "__id__": 414 }, "_lpos": { "__type__": "cc.Vec3", @@ -9571,11 +9770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 411 }, "_contentSize": { "__type__": "cc.Size", @@ -9599,11 +9798,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 413 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9660,11 +9859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 408 + "__id__": 416 }, "_contentSize": { "__type__": "cc.Size", @@ -9688,11 +9887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 418 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9736,11 +9935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 420 }, "_alignFlags": 45, "_target": null, @@ -9785,11 +9984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 423 }, "_contentSize": { "__type__": "cc.Size", @@ -9813,11 +10012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 425 }, "_alignFlags": 45, "_target": null, @@ -9862,23 +10061,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [], "_active": true, "_components": [ { - "__id__": 420 + "__id__": 428 }, { - "__id__": 422 + "__id__": 430 }, { - "__id__": 424 + "__id__": 432 } ], "_prefab": { - "__id__": 426 + "__id__": 434 }, "_lpos": { "__type__": "cc.Vec3", @@ -9915,11 +10114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 429 }, "_contentSize": { "__type__": "cc.Size", @@ -9943,11 +10142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 431 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9991,11 +10190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 433 }, "playOnLoad": false, "_clips": [], @@ -10025,23 +10224,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [], "_active": true, "_components": [ { - "__id__": 428 + "__id__": 436 }, { - "__id__": 430 + "__id__": 438 }, { - "__id__": 432 + "__id__": 440 } ], "_prefab": { - "__id__": 434 + "__id__": 442 }, "_lpos": { "__type__": "cc.Vec3", @@ -10078,11 +10277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 427 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -10106,11 +10305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 427 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10174,11 +10373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 427 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 441 }, "_alignFlags": 17, "_target": null, @@ -10223,12 +10422,9 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ - { - "__id__": 436 - }, { "__id__": 444 }, @@ -10249,19 +10445,22 @@ }, { "__id__": 492 + }, + { + "__id__": 500 } ], "_active": true, "_components": [ { - "__id__": 501 + "__id__": 509 }, { - "__id__": 503 + "__id__": 511 } ], "_prefab": { - "__id__": 505 + "__id__": 513 }, "_lpos": { "__type__": "cc.Vec3", @@ -10298,186 +10497,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 437 - }, - { - "__id__": 439 - }, - { - "__id__": 441 - } - ], - "_prefab": { "__id__": 443 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 436 - }, - "_enabled": true, - "__prefab": { - "__id__": 438 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 170, - "height": 230 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d4Pd5UdRVC16NBMS0cFC50" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 436 - }, - "_enabled": true, - "__prefab": { - "__id__": 440 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fblqHsa8NJHZZQo/MYNr70" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 436 - }, - "_enabled": true, - "__prefab": { - "__id__": 442 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 181, - "_originalHeight": 202, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ddhbIlKSxH/ry90mj0MCYP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "383bE5vX1F26T6EyKXIhM0", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Card", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 435 - }, "_children": [], "_active": false, "_components": [ @@ -10537,8 +10558,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 230, - "height": 330 + "width": 170, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10549,7 +10570,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dbX1enGTNGaYMLrUPPszhA" + "fileId": "d4Pd5UdRVC16NBMS0cFC50" }, { "__type__": "cc.Sprite", @@ -10574,7 +10595,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@df52c", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -10597,7 +10618,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bdlrrULpVLb7vQ3C70iHA3" + "fileId": "fblqHsa8NJHZZQo/MYNr70" }, { "__type__": "cc.Widget", @@ -10633,7 +10654,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07JpeCZAZGvZT+0JlVxtBR" + "fileId": "ddhbIlKSxH/ry90mj0MCYP" }, { "__type__": "cc.PrefabInfo", @@ -10643,18 +10664,18 @@ "asset": { "__id__": 0 }, - "fileId": "82OCWwPsZLr4QnNIGfNCF1", + "fileId": "383bE5vX1F26T6EyKXIhM0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Hero", + "_name": "Card", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": false, @@ -10727,7 +10748,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "50xLZPDExM15JebGkPUhrN" + "fileId": "dbX1enGTNGaYMLrUPPszhA" }, { "__type__": "cc.Sprite", @@ -10752,7 +10773,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@df52c", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -10775,7 +10796,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23VuWJdPNPD5XfRuYmmLwp" + "fileId": "bdlrrULpVLb7vQ3C70iHA3" }, { "__type__": "cc.Widget", @@ -10811,7 +10832,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0++MTZkxG677yL/ztCNwE" + "fileId": "07JpeCZAZGvZT+0JlVxtBR" }, { "__type__": "cc.PrefabInfo", @@ -10821,18 +10842,18 @@ "asset": { "__id__": 0 }, - "fileId": "403br0ZFJCiaiTREPrpZEq", + "fileId": "82OCWwPsZLr4QnNIGfNCF1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Skill", + "_name": "Hero", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": false, @@ -10893,8 +10914,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, - "height": 230 + "width": 230, + "height": 330 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10905,7 +10926,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d6mgT98DZD34Q3LIfjMbLM" + "fileId": "50xLZPDExM15JebGkPUhrN" }, { "__type__": "cc.Sprite", @@ -10930,7 +10951,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e19cf", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -10953,7 +10974,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "55ZdUkQptJd4hxEdx8QB+B" + "fileId": "23VuWJdPNPD5XfRuYmmLwp" }, { "__type__": "cc.Widget", @@ -10989,7 +11010,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "49KCCmePNLfIvBM5Oj6UG0" + "fileId": "f0++MTZkxG677yL/ztCNwE" }, { "__type__": "cc.PrefabInfo", @@ -10999,21 +11020,21 @@ "asset": { "__id__": 0 }, - "fileId": "4eh6GJfjdBfrVatb5NAc7W", + "fileId": "403br0ZFJCiaiTREPrpZEq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Potion", + "_name": "Skill", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 469 @@ -11071,8 +11092,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 230, - "height": 330 + "width": 170, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11083,7 +11104,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "45fSM4gVRASYktH7u3eAGw" + "fileId": "d6mgT98DZD34Q3LIfjMbLM" }, { "__type__": "cc.Sprite", @@ -11108,7 +11129,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e9809", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e19cf", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -11131,7 +11152,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "77NOjdkZpDHqiZMb0ITho+" + "fileId": "55ZdUkQptJd4hxEdx8QB+B" }, { "__type__": "cc.Widget", @@ -11167,7 +11188,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "02Lq9iYQZID5FJiETHd5bA" + "fileId": "49KCCmePNLfIvBM5Oj6UG0" }, { "__type__": "cc.PrefabInfo", @@ -11177,21 +11198,21 @@ "asset": { "__id__": 0 }, - "fileId": "aeVH9mJeBIoZFmTc8MyibA", + "fileId": "4eh6GJfjdBfrVatb5NAc7W", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "lv5", + "_name": "Potion", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 477 @@ -11261,7 +11282,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "32I3tl39xPcL8zJr+0ZHTy" + "fileId": "45fSM4gVRASYktH7u3eAGw" }, { "__type__": "cc.Sprite", @@ -11285,6 +11306,184 @@ "b": 255, "a": 255 }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e9809", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "77NOjdkZpDHqiZMb0ITho+" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 476 + }, + "_enabled": true, + "__prefab": { + "__id__": 482 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02Lq9iYQZID5FJiETHd5bA" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "aeVH9mJeBIoZFmTc8MyibA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv5", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 443 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 485 + }, + { + "__id__": 487 + }, + { + "__id__": 489 + } + ], + "_prefab": { + "__id__": 491 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 484 + }, + "_enabled": true, + "__prefab": { + "__id__": 486 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 230, + "height": 330 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "32I3tl39xPcL8zJr+0ZHTy" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 484 + }, + "_enabled": true, + "__prefab": { + "__id__": 488 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, "_spriteFrame": { "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d5f55", "__expectedType__": "cc.SpriteFrame" @@ -11317,11 +11516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 490 }, "_alignFlags": 45, "_target": null, @@ -11366,23 +11565,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 443 }, "_children": [], "_active": false, "_components": [ { - "__id__": 485 + "__id__": 493 }, { - "__id__": 487 + "__id__": 495 }, { - "__id__": 489 + "__id__": 497 } ], "_prefab": { - "__id__": 491 + "__id__": 499 }, "_lpos": { "__type__": "cc.Vec3", @@ -11419,11 +11618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 492 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 494 }, "_contentSize": { "__type__": "cc.Size", @@ -11447,11 +11646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 492 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 496 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11492,11 +11691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 492 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 498 }, "_alignFlags": 44, "_target": null, @@ -11539,17 +11738,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 435 + "__id__": 443 }, "_prefab": { - "__id__": 493 + "__id__": 501 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 492 + "__id__": 500 }, "asset": { "__uuid__": "5aae4a6d-b697-4c4b-86d3-8ea91be92be6", @@ -11557,7 +11756,7 @@ }, "fileId": "7347RlFLBEdJZ/A06wfR5f", "instance": { - "__id__": 494 + "__id__": 502 }, "targetOverrides": null }, @@ -11571,19 +11770,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 495 + "__id__": 503 }, { - "__id__": 497 + "__id__": 505 }, { - "__id__": 498 + "__id__": 506 }, { - "__id__": 499 + "__id__": 507 }, { - "__id__": 500 + "__id__": 508 } ], "removedComponents": [] @@ -11591,7 +11790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_name" @@ -11607,7 +11806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_lpos" @@ -11622,7 +11821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_lrot" @@ -11638,7 +11837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_euler" @@ -11653,7 +11852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 504 }, "propertyPath": [ "_active" @@ -11666,11 +11865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -11694,11 +11893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 512 }, "_alignFlags": 45, "_target": null, @@ -11743,27 +11942,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ { - "__id__": 507 + "__id__": 515 }, { - "__id__": 515 + "__id__": 523 } ], "_active": true, "_components": [ { - "__id__": 523 + "__id__": 531 }, { - "__id__": 525 + "__id__": 533 } ], "_prefab": { - "__id__": 527 + "__id__": 535 }, "_lpos": { "__type__": "cc.Vec3", @@ -11800,183 +11999,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 506 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 508 - }, - { - "__id__": 510 - }, - { - "__id__": 512 - } - ], - "_prefab": { "__id__": 514 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 507 - }, - "_enabled": true, - "__prefab": { - "__id__": 509 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cbi8KnKIlHK4Nv3nWGpzcS" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 507 - }, - "_enabled": true, - "__prefab": { - "__id__": 511 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 56 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7f50d", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3bKhRAiTpIapBdyga+FmxG" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 507 - }, - "_enabled": true, - "__prefab": { - "__id__": 513 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 250, - "_originalHeight": 63, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "87BJl1npxPGa81h4FseOfT" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1fB7BfpGdAipKQZ3H4HFEj", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "info", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 506 - }, "_children": [], "_active": true, "_components": [ @@ -12048,10 +12072,10 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cffZgGMc9NipoNOUReEyUk" + "fileId": "cbi8KnKIlHK4Nv3nWGpzcS" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -12065,6 +12089,181 @@ "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 56 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7f50d", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3bKhRAiTpIapBdyga+FmxG" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 515 + }, + "_enabled": true, + "__prefab": { + "__id__": 521 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 250, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "87BJl1npxPGa81h4FseOfT" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1fB7BfpGdAipKQZ3H4HFEj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "info", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 514 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 524 + }, + { + "__id__": 526 + }, + { + "__id__": 528 + } + ], + "_prefab": { + "__id__": 530 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 523 + }, + "_enabled": true, + "__prefab": { + "__id__": 525 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 140 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cffZgGMc9NipoNOUReEyUk" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 523 + }, + "_enabled": true, + "__prefab": { + "__id__": 527 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", "r": 255, @@ -12124,11 +12323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 515 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 529 }, "_alignFlags": 45, "_target": null, @@ -12173,11 +12372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 514 }, "_enabled": true, "__prefab": { - "__id__": 524 + "__id__": 532 }, "_contentSize": { "__type__": "cc.Size", @@ -12201,11 +12400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 514 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 534 }, "_alignFlags": 16, "_target": null, @@ -12250,33 +12449,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ { - "__id__": 529 + "__id__": 537 }, { - "__id__": 535 + "__id__": 543 }, { - "__id__": 541 - }, - { - "__id__": 547 - } - ], - "_active": false, - "_components": [ - { - "__id__": 553 + "__id__": 549 }, { "__id__": 555 } ], + "_active": false, + "_components": [ + { + "__id__": 561 + }, + { + "__id__": 563 + } + ], "_prefab": { - "__id__": 557 + "__id__": 565 }, "_lpos": { "__type__": "cc.Vec3", @@ -12313,20 +12512,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 536 }, "_children": [], "_active": true, "_components": [ { - "__id__": 530 + "__id__": 538 }, { - "__id__": 532 + "__id__": 540 } ], "_prefab": { - "__id__": 534 + "__id__": 542 }, "_lpos": { "__type__": "cc.Vec3", @@ -12363,11 +12562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 537 }, "_enabled": true, "__prefab": { - "__id__": 531 + "__id__": 539 }, "_contentSize": { "__type__": "cc.Size", @@ -12391,11 +12590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 537 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 541 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12449,20 +12648,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 536 }, "_children": [], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 544 }, { - "__id__": 538 + "__id__": 546 } ], "_prefab": { - "__id__": 540 + "__id__": 548 }, "_lpos": { "__type__": "cc.Vec3", @@ -12499,11 +12698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 535 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -12527,11 +12726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 535 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12588,20 +12787,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 536 }, "_children": [], "_active": true, "_components": [ { - "__id__": 542 + "__id__": 550 }, { - "__id__": 544 + "__id__": 552 } ], "_prefab": { - "__id__": 546 + "__id__": 554 }, "_lpos": { "__type__": "cc.Vec3", @@ -12638,11 +12837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 543 + "__id__": 551 }, "_contentSize": { "__type__": "cc.Size", @@ -12666,11 +12865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 553 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12727,20 +12926,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 536 }, "_children": [], "_active": true, "_components": [ { - "__id__": 548 + "__id__": 556 }, { - "__id__": 550 + "__id__": 558 } ], "_prefab": { - "__id__": 552 + "__id__": 560 }, "_lpos": { "__type__": "cc.Vec3", @@ -12777,11 +12976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 547 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 557 }, "_contentSize": { "__type__": "cc.Size", @@ -12805,11 +13004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 547 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 559 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12866,11 +13065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 554 + "__id__": 562 }, "_contentSize": { "__type__": "cc.Size", @@ -12894,11 +13093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 556 + "__id__": 564 }, "_alignFlags": 33, "_target": null, @@ -12943,42 +13142,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ { - "__id__": 559 + "__id__": 567 }, { - "__id__": 565 + "__id__": 573 }, { - "__id__": 575 + "__id__": 583 }, { - "__id__": 591 + "__id__": 599 }, { - "__id__": 613 + "__id__": 621 }, { - "__id__": 641 + "__id__": 649 }, { - "__id__": 675 + "__id__": 683 } ], "_active": true, "_components": [ { - "__id__": 715 + "__id__": 723 }, { - "__id__": 717 + "__id__": 725 } ], "_prefab": { - "__id__": 719 + "__id__": 727 }, "_lpos": { "__type__": "cc.Vec3", @@ -13015,20 +13214,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [], "_active": true, "_components": [ { - "__id__": 560 + "__id__": 568 }, { - "__id__": 562 + "__id__": 570 } ], "_prefab": { - "__id__": 564 + "__id__": 572 }, "_lpos": { "__type__": "cc.Vec3", @@ -13065,11 +13264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 567 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 569 }, "_contentSize": { "__type__": "cc.Size", @@ -13093,11 +13292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 567 }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 571 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13151,21 +13350,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 566 + "__id__": 574 } ], "_active": true, "_components": [ { - "__id__": 572 + "__id__": 580 } ], "_prefab": { - "__id__": 574 + "__id__": 582 }, "_lpos": { "__type__": "cc.Vec3", @@ -13202,20 +13401,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 565 + "__id__": 573 }, "_children": [], "_active": true, "_components": [ { - "__id__": 567 + "__id__": 575 }, { - "__id__": 569 + "__id__": 577 } ], "_prefab": { - "__id__": 571 + "__id__": 579 }, "_lpos": { "__type__": "cc.Vec3", @@ -13252,11 +13451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 566 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 568 + "__id__": 576 }, "_contentSize": { "__type__": "cc.Size", @@ -13280,11 +13479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 566 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 570 + "__id__": 578 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13338,11 +13537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 573 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 581 }, "_contentSize": { "__type__": "cc.Size", @@ -13379,24 +13578,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 576 + "__id__": 584 }, { - "__id__": 582 + "__id__": 590 } ], "_active": true, "_components": [ { - "__id__": 588 + "__id__": 596 } ], "_prefab": { - "__id__": 590 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -13433,20 +13632,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 575 + "__id__": 583 }, "_children": [], "_active": true, "_components": [ { - "__id__": 577 + "__id__": 585 }, { - "__id__": 579 + "__id__": 587 } ], "_prefab": { - "__id__": 581 + "__id__": 589 }, "_lpos": { "__type__": "cc.Vec3", @@ -13483,11 +13682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 578 + "__id__": 586 }, "_contentSize": { "__type__": "cc.Size", @@ -13511,11 +13710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 580 + "__id__": 588 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13569,20 +13768,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 575 + "__id__": 583 }, "_children": [], "_active": true, "_components": [ { - "__id__": 583 + "__id__": 591 }, { - "__id__": 585 + "__id__": 593 } ], "_prefab": { - "__id__": 587 + "__id__": 595 }, "_lpos": { "__type__": "cc.Vec3", @@ -13619,11 +13818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 582 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 592 }, "_contentSize": { "__type__": "cc.Size", @@ -13647,11 +13846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 582 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 594 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13705,11 +13904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 583 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 597 }, "_contentSize": { "__type__": "cc.Size", @@ -13746,27 +13945,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 592 + "__id__": 600 }, { - "__id__": 598 + "__id__": 606 }, { - "__id__": 604 + "__id__": 612 } ], "_active": true, "_components": [ { - "__id__": 610 + "__id__": 618 } ], "_prefab": { - "__id__": 612 + "__id__": 620 }, "_lpos": { "__type__": "cc.Vec3", @@ -13803,20 +14002,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 591 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 593 + "__id__": 601 }, { - "__id__": 595 + "__id__": 603 } ], "_prefab": { - "__id__": 597 + "__id__": 605 }, "_lpos": { "__type__": "cc.Vec3", @@ -13853,11 +14052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 592 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 594 + "__id__": 602 }, "_contentSize": { "__type__": "cc.Size", @@ -13881,11 +14080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 592 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 604 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13939,20 +14138,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 591 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 599 + "__id__": 607 }, { - "__id__": 601 + "__id__": 609 } ], "_prefab": { - "__id__": 603 + "__id__": 611 }, "_lpos": { "__type__": "cc.Vec3", @@ -13989,11 +14188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 598 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 608 }, "_contentSize": { "__type__": "cc.Size", @@ -14017,11 +14216,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 598 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 610 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14075,20 +14274,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 591 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 605 + "__id__": 613 }, { - "__id__": 607 + "__id__": 615 } ], "_prefab": { - "__id__": 609 + "__id__": 617 }, "_lpos": { "__type__": "cc.Vec3", @@ -14125,11 +14324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 604 + "__id__": 612 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 614 }, "_contentSize": { "__type__": "cc.Size", @@ -14153,11 +14352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 604 + "__id__": 612 }, "_enabled": true, "__prefab": { - "__id__": 608 + "__id__": 616 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14211,11 +14410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 599 }, "_enabled": true, "__prefab": { - "__id__": 611 + "__id__": 619 }, "_contentSize": { "__type__": "cc.Size", @@ -14252,30 +14451,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 614 + "__id__": 622 }, { - "__id__": 620 + "__id__": 628 }, { - "__id__": 626 + "__id__": 634 }, { - "__id__": 632 + "__id__": 640 } ], "_active": true, "_components": [ { - "__id__": 638 + "__id__": 646 } ], "_prefab": { - "__id__": 640 + "__id__": 648 }, "_lpos": { "__type__": "cc.Vec3", @@ -14312,20 +14511,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 613 + "__id__": 621 }, "_children": [], "_active": true, "_components": [ { - "__id__": 615 + "__id__": 623 }, { - "__id__": 617 + "__id__": 625 } ], "_prefab": { - "__id__": 619 + "__id__": 627 }, "_lpos": { "__type__": "cc.Vec3", @@ -14362,11 +14561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 614 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 624 }, "_contentSize": { "__type__": "cc.Size", @@ -14390,11 +14589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 614 + "__id__": 622 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 626 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14448,20 +14647,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 613 + "__id__": 621 }, "_children": [], "_active": true, "_components": [ { - "__id__": 621 + "__id__": 629 }, { - "__id__": 623 + "__id__": 631 } ], "_prefab": { - "__id__": 625 + "__id__": 633 }, "_lpos": { "__type__": "cc.Vec3", @@ -14498,11 +14697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 630 }, "_contentSize": { "__type__": "cc.Size", @@ -14526,11 +14725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 632 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14584,20 +14783,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 613 + "__id__": 621 }, "_children": [], "_active": true, "_components": [ { - "__id__": 627 + "__id__": 635 }, { - "__id__": 629 + "__id__": 637 } ], "_prefab": { - "__id__": 631 + "__id__": 639 }, "_lpos": { "__type__": "cc.Vec3", @@ -14634,11 +14833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 634 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -14662,11 +14861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 634 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 638 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14720,20 +14919,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 613 + "__id__": 621 }, "_children": [], "_active": true, "_components": [ { - "__id__": 633 + "__id__": 641 }, { - "__id__": 635 + "__id__": 643 } ], "_prefab": { - "__id__": 637 + "__id__": 645 }, "_lpos": { "__type__": "cc.Vec3", @@ -14770,11 +14969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 642 }, "_contentSize": { "__type__": "cc.Size", @@ -14798,11 +14997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 644 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14856,11 +15055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 613 + "__id__": 621 }, "_enabled": true, "__prefab": { - "__id__": 639 + "__id__": 647 }, "_contentSize": { "__type__": "cc.Size", @@ -14897,33 +15096,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 642 + "__id__": 650 }, { - "__id__": 648 + "__id__": 656 }, { - "__id__": 654 + "__id__": 662 }, { - "__id__": 660 + "__id__": 668 }, { - "__id__": 666 + "__id__": 674 } ], "_active": true, "_components": [ { - "__id__": 672 + "__id__": 680 } ], "_prefab": { - "__id__": 674 + "__id__": 682 }, "_lpos": { "__type__": "cc.Vec3", @@ -14960,20 +15159,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 649 }, "_children": [], "_active": true, "_components": [ { - "__id__": 643 + "__id__": 651 }, { - "__id__": 645 + "__id__": 653 } ], "_prefab": { - "__id__": 647 + "__id__": 655 }, "_lpos": { "__type__": "cc.Vec3", @@ -15010,11 +15209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 652 }, "_contentSize": { "__type__": "cc.Size", @@ -15038,11 +15237,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 654 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15096,20 +15295,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 649 }, "_children": [], "_active": true, "_components": [ { - "__id__": 649 + "__id__": 657 }, { - "__id__": 651 + "__id__": 659 } ], "_prefab": { - "__id__": 653 + "__id__": 661 }, "_lpos": { "__type__": "cc.Vec3", @@ -15146,11 +15345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 650 + "__id__": 658 }, "_contentSize": { "__type__": "cc.Size", @@ -15174,11 +15373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 660 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15232,20 +15431,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 649 }, "_children": [], "_active": true, "_components": [ { - "__id__": 655 + "__id__": 663 }, { - "__id__": 657 + "__id__": 665 } ], "_prefab": { - "__id__": 659 + "__id__": 667 }, "_lpos": { "__type__": "cc.Vec3", @@ -15282,11 +15481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 662 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 664 }, "_contentSize": { "__type__": "cc.Size", @@ -15310,11 +15509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 662 }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 666 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15368,20 +15567,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 649 }, "_children": [], "_active": true, "_components": [ { - "__id__": 661 + "__id__": 669 }, { - "__id__": 663 + "__id__": 671 } ], "_prefab": { - "__id__": 665 + "__id__": 673 }, "_lpos": { "__type__": "cc.Vec3", @@ -15418,11 +15617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 670 }, "_contentSize": { "__type__": "cc.Size", @@ -15446,11 +15645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 672 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15504,20 +15703,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 649 }, "_children": [], "_active": true, "_components": [ { - "__id__": 667 + "__id__": 675 }, { - "__id__": 669 + "__id__": 677 } ], "_prefab": { - "__id__": 671 + "__id__": 679 }, "_lpos": { "__type__": "cc.Vec3", @@ -15554,11 +15753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 674 }, "_enabled": true, "__prefab": { - "__id__": 668 + "__id__": 676 }, "_contentSize": { "__type__": "cc.Size", @@ -15582,11 +15781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 674 }, "_enabled": true, "__prefab": { - "__id__": 670 + "__id__": 678 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15640,11 +15839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 649 }, "_enabled": true, "__prefab": { - "__id__": 673 + "__id__": 681 }, "_contentSize": { "__type__": "cc.Size", @@ -15681,36 +15880,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 566 }, "_children": [ { - "__id__": 676 + "__id__": 684 }, { - "__id__": 682 + "__id__": 690 }, { - "__id__": 688 + "__id__": 696 }, { - "__id__": 694 + "__id__": 702 }, { - "__id__": 700 + "__id__": 708 }, { - "__id__": 706 + "__id__": 714 } ], "_active": true, "_components": [ { - "__id__": 712 + "__id__": 720 } ], "_prefab": { - "__id__": 714 + "__id__": 722 }, "_lpos": { "__type__": "cc.Vec3", @@ -15747,20 +15946,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 677 + "__id__": 685 }, { - "__id__": 679 + "__id__": 687 } ], "_prefab": { - "__id__": 681 + "__id__": 689 }, "_lpos": { "__type__": "cc.Vec3", @@ -15797,11 +15996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 684 }, "_enabled": true, "__prefab": { - "__id__": 678 + "__id__": 686 }, "_contentSize": { "__type__": "cc.Size", @@ -15825,11 +16024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 684 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 688 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15883,20 +16082,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 683 + "__id__": 691 }, { - "__id__": 685 + "__id__": 693 } ], "_prefab": { - "__id__": 687 + "__id__": 695 }, "_lpos": { "__type__": "cc.Vec3", @@ -15933,11 +16132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 682 + "__id__": 690 }, "_enabled": true, "__prefab": { - "__id__": 684 + "__id__": 692 }, "_contentSize": { "__type__": "cc.Size", @@ -15961,11 +16160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 682 + "__id__": 690 }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 694 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16019,20 +16218,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 689 + "__id__": 697 }, { - "__id__": 691 + "__id__": 699 } ], "_prefab": { - "__id__": 693 + "__id__": 701 }, "_lpos": { "__type__": "cc.Vec3", @@ -16069,11 +16268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 688 + "__id__": 696 }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 698 }, "_contentSize": { "__type__": "cc.Size", @@ -16097,11 +16296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 688 + "__id__": 696 }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 700 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16155,20 +16354,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 695 + "__id__": 703 }, { - "__id__": 697 + "__id__": 705 } ], "_prefab": { - "__id__": 699 + "__id__": 707 }, "_lpos": { "__type__": "cc.Vec3", @@ -16205,11 +16404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 694 + "__id__": 702 }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 704 }, "_contentSize": { "__type__": "cc.Size", @@ -16233,11 +16432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 694 + "__id__": 702 }, "_enabled": true, "__prefab": { - "__id__": 698 + "__id__": 706 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16291,20 +16490,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 701 + "__id__": 709 }, { - "__id__": 703 + "__id__": 711 } ], "_prefab": { - "__id__": 705 + "__id__": 713 }, "_lpos": { "__type__": "cc.Vec3", @@ -16341,11 +16540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 700 + "__id__": 708 }, "_enabled": true, "__prefab": { - "__id__": 702 + "__id__": 710 }, "_contentSize": { "__type__": "cc.Size", @@ -16369,11 +16568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 700 + "__id__": 708 }, "_enabled": true, "__prefab": { - "__id__": 704 + "__id__": 712 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16427,20 +16626,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 707 + "__id__": 715 }, { - "__id__": 709 + "__id__": 717 } ], "_prefab": { - "__id__": 711 + "__id__": 719 }, "_lpos": { "__type__": "cc.Vec3", @@ -16477,11 +16676,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 708 + "__id__": 716 }, "_contentSize": { "__type__": "cc.Size", @@ -16505,11 +16704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 710 + "__id__": 718 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16563,11 +16762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 683 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 721 }, "_contentSize": { "__type__": "cc.Size", @@ -16604,11 +16803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 716 + "__id__": 724 }, "_contentSize": { "__type__": "cc.Size", @@ -16632,11 +16831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 726 }, "_alignFlags": 9, "_target": null, @@ -16681,33 +16880,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ - { - "__id__": 721 - }, { "__id__": 729 }, { - "__id__": 735 + "__id__": 737 + }, + { + "__id__": 743 } ], "_active": true, "_components": [ { - "__id__": 741 + "__id__": 749 }, { - "__id__": 743 + "__id__": 751 }, { - "__id__": 745 + "__id__": 753 } ], "_prefab": { - "__id__": 747 + "__id__": 755 }, "_lpos": { "__type__": "cc.Vec3", @@ -16744,183 +16943,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 720 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 722 - }, - { - "__id__": 724 - }, - { - "__id__": 726 - } - ], - "_prefab": { "__id__": 728 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 721 - }, - "_enabled": true, - "__prefab": { - "__id__": 723 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 95, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c4lp3gLHBPJ5uMLLdlamIg" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 721 - }, - "_enabled": false, - "__prefab": { - "__id__": 725 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 59 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7f50d", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2qtsOs75ANKEhzukBVTas" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 721 - }, - "_enabled": true, - "__prefab": { - "__id__": 727 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 250, - "_originalHeight": 63, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "17adMTPg5LGp6uEo7aTp3g" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f73lmr3rdHKYZeL0vMc05I", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Economy_Heart_Red", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 720 - }, "_children": [], "_active": true, "_components": [ @@ -16929,10 +16953,13 @@ }, { "__id__": 732 + }, + { + "__id__": 734 } ], "_prefab": { - "__id__": 734 + "__id__": 736 }, "_lpos": { "__type__": "cc.Vec3", @@ -16975,6 +17002,178 @@ "__prefab": { "__id__": 731 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 95, + "height": 30 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c4lp3gLHBPJ5uMLLdlamIg" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 729 + }, + "_enabled": false, + "__prefab": { + "__id__": 733 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 59 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7f50d", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b2qtsOs75ANKEhzukBVTas" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 729 + }, + "_enabled": true, + "__prefab": { + "__id__": 735 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 250, + "_originalHeight": 63, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "17adMTPg5LGp6uEo7aTp3g" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f73lmr3rdHKYZeL0vMc05I", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Economy_Heart_Red", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 728 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 738 + }, + { + "__id__": 740 + } + ], + "_prefab": { + "__id__": 742 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 737 + }, + "_enabled": true, + "__prefab": { + "__id__": 739 + }, "_contentSize": { "__type__": "cc.Size", "width": 45, @@ -16997,11 +17196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 737 }, "_enabled": true, "__prefab": { - "__id__": 733 + "__id__": 741 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17055,20 +17254,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 720 + "__id__": 728 }, "_children": [], "_active": true, "_components": [ { - "__id__": 736 + "__id__": 744 }, { - "__id__": 738 + "__id__": 746 } ], "_prefab": { - "__id__": 740 + "__id__": 748 }, "_lpos": { "__type__": "cc.Vec3", @@ -17105,11 +17304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 743 }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 745 }, "_contentSize": { "__type__": "cc.Size", @@ -17133,11 +17332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 743 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 747 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17214,11 +17413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 720 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 742 + "__id__": 750 }, "_contentSize": { "__type__": "cc.Size", @@ -17242,11 +17441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 720 + "__id__": 728 }, "_enabled": false, "__prefab": { - "__id__": 744 + "__id__": 752 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17287,11 +17486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 720 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 746 + "__id__": 754 }, "_alignFlags": 36, "_target": null, @@ -17336,33 +17535,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ - { - "__id__": 749 - }, { "__id__": 757 }, { - "__id__": 763 + "__id__": 765 + }, + { + "__id__": 771 } ], "_active": true, "_components": [ { - "__id__": 769 + "__id__": 777 }, { - "__id__": 771 + "__id__": 779 }, { - "__id__": 773 + "__id__": 781 } ], "_prefab": { - "__id__": 775 + "__id__": 783 }, "_lpos": { "__type__": "cc.Vec3", @@ -17399,23 +17598,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 748 + "__id__": 756 }, "_children": [], "_active": true, "_components": [ { - "__id__": 750 + "__id__": 758 }, { - "__id__": 752 + "__id__": 760 }, { - "__id__": 754 + "__id__": 762 } ], "_prefab": { - "__id__": 756 + "__id__": 764 }, "_lpos": { "__type__": "cc.Vec3", @@ -17452,11 +17651,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 751 + "__id__": 759 }, "_contentSize": { "__type__": "cc.Size", @@ -17480,11 +17679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 757 }, "_enabled": false, "__prefab": { - "__id__": 753 + "__id__": 761 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17525,11 +17724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 763 }, "_alignFlags": 45, "_target": null, @@ -17574,20 +17773,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 748 + "__id__": 756 }, "_children": [], "_active": true, "_components": [ { - "__id__": 758 + "__id__": 766 }, { - "__id__": 760 + "__id__": 768 } ], "_prefab": { - "__id__": 762 + "__id__": 770 }, "_lpos": { "__type__": "cc.Vec3", @@ -17624,11 +17823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 757 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 759 + "__id__": 767 }, "_contentSize": { "__type__": "cc.Size", @@ -17652,11 +17851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 757 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 761 + "__id__": 769 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17710,20 +17909,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 748 + "__id__": 756 }, "_children": [], "_active": true, "_components": [ { - "__id__": 764 + "__id__": 772 }, { - "__id__": 766 + "__id__": 774 } ], "_prefab": { - "__id__": 768 + "__id__": 776 }, "_lpos": { "__type__": "cc.Vec3", @@ -17760,11 +17959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 771 }, "_enabled": true, "__prefab": { - "__id__": 765 + "__id__": 773 }, "_contentSize": { "__type__": "cc.Size", @@ -17788,11 +17987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 771 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 775 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17869,11 +18068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 748 + "__id__": 756 }, "_enabled": true, "__prefab": { - "__id__": 770 + "__id__": 778 }, "_contentSize": { "__type__": "cc.Size", @@ -17897,11 +18096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 748 + "__id__": 756 }, "_enabled": false, "__prefab": { - "__id__": 772 + "__id__": 780 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17942,11 +18141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 748 + "__id__": 756 }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 782 }, "_alignFlags": 12, "_target": null, @@ -17991,24 +18190,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 334 + "__id__": 342 }, "_children": [ { - "__id__": 777 + "__id__": 785 } ], "_active": true, "_components": [ { - "__id__": 783 + "__id__": 791 }, { - "__id__": 785 + "__id__": 793 } ], "_prefab": { - "__id__": 787 + "__id__": 795 }, "_lpos": { "__type__": "cc.Vec3", @@ -18045,20 +18244,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 776 + "__id__": 784 }, "_children": [], "_active": true, "_components": [ { - "__id__": 778 + "__id__": 786 }, { - "__id__": 780 + "__id__": 788 } ], "_prefab": { - "__id__": 782 + "__id__": 790 }, "_lpos": { "__type__": "cc.Vec3", @@ -18095,11 +18294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 777 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 779 + "__id__": 787 }, "_contentSize": { "__type__": "cc.Size", @@ -18123,11 +18322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 777 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 781 + "__id__": 789 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18204,11 +18403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 776 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 784 + "__id__": 792 }, "_contentSize": { "__type__": "cc.Size", @@ -18232,11 +18431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 776 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 794 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18293,11 +18492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 342 }, "_enabled": true, "__prefab": { - "__id__": 789 + "__id__": 797 }, "_contentSize": { "__type__": "cc.Size", @@ -18334,11 +18533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 800 }, "_contentSize": { "__type__": "cc.Size", @@ -18362,18 +18561,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 794 + "__id__": 802 }, "_alignFlags": 45, "_target": null, "_left": 30, "_right": 30, - "_top": 53.713999999999956, - "_bottom": 266.286, + "_top": -115.327, + "_bottom": 435.327, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -18398,11 +18597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 796 + "__id__": 804 }, "playOnLoad": false, "_clips": [ @@ -18446,14 +18645,14 @@ "_active": true, "_components": [ { - "__id__": 799 + "__id__": 807 }, { - "__id__": 801 + "__id__": 809 } ], "_prefab": { - "__id__": 803 + "__id__": 811 }, "_lpos": { "__type__": "cc.Vec3", @@ -18490,11 +18689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 806 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 808 }, "_contentSize": { "__type__": "cc.Size", @@ -18518,11 +18717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 806 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 810 }, "_alignFlags": 40, "_target": null, @@ -18571,26 +18770,26 @@ }, "_children": [ { - "__id__": 805 + "__id__": 813 }, { - "__id__": 811 + "__id__": 819 }, { - "__id__": 817 + "__id__": 825 }, { - "__id__": 823 + "__id__": 831 } ], "_active": true, "_components": [ { - "__id__": 829 + "__id__": 837 } ], "_prefab": { - "__id__": 831 + "__id__": 839 }, "_lpos": { "__type__": "cc.Vec3", @@ -18627,20 +18826,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 804 + "__id__": 812 }, "_children": [], "_active": true, "_components": [ { - "__id__": 806 + "__id__": 814 }, { - "__id__": 808 + "__id__": 816 } ], "_prefab": { - "__id__": 810 + "__id__": 818 }, "_lpos": { "__type__": "cc.Vec3", @@ -18677,11 +18876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 805 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 807 + "__id__": 815 }, "_contentSize": { "__type__": "cc.Size", @@ -18705,11 +18904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 805 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 809 + "__id__": 817 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18786,20 +18985,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 804 + "__id__": 812 }, "_children": [], "_active": true, "_components": [ { - "__id__": 812 + "__id__": 820 }, { - "__id__": 814 + "__id__": 822 } ], "_prefab": { - "__id__": 816 + "__id__": 824 }, "_lpos": { "__type__": "cc.Vec3", @@ -18836,11 +19035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 811 + "__id__": 819 }, "_enabled": true, "__prefab": { - "__id__": 813 + "__id__": 821 }, "_contentSize": { "__type__": "cc.Size", @@ -18864,11 +19063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 811 + "__id__": 819 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 823 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18922,20 +19121,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 804 + "__id__": 812 }, "_children": [], "_active": true, "_components": [ { - "__id__": 818 + "__id__": 826 }, { - "__id__": 820 + "__id__": 828 } ], "_prefab": { - "__id__": 822 + "__id__": 830 }, "_lpos": { "__type__": "cc.Vec3", @@ -18972,11 +19171,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 817 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 827 }, "_contentSize": { "__type__": "cc.Size", @@ -19000,11 +19199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 817 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 821 + "__id__": 829 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19081,20 +19280,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 804 + "__id__": 812 }, "_children": [], "_active": true, "_components": [ { - "__id__": 824 + "__id__": 832 }, { - "__id__": 826 + "__id__": 834 } ], "_prefab": { - "__id__": 828 + "__id__": 836 }, "_lpos": { "__type__": "cc.Vec3", @@ -19131,11 +19330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 823 + "__id__": 831 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 833 }, "_contentSize": { "__type__": "cc.Size", @@ -19159,11 +19358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 823 + "__id__": 831 }, "_enabled": true, "__prefab": { - "__id__": 827 + "__id__": 835 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19240,11 +19439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 804 + "__id__": 812 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 838 }, "_contentSize": { "__type__": "cc.Size", @@ -19285,7 +19484,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 833 + "__id__": 841 }, "_contentSize": { "__type__": "cc.Size", @@ -19313,7 +19512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 843 }, "_alignFlags": 45, "_target": null, @@ -19362,29 +19561,29 @@ }, "_children": [ { - "__id__": 838 + "__id__": 846 }, { - "__id__": 853 + "__id__": 861 }, { - "__id__": 868 + "__id__": 876 } ], "_active": true, "_components": [ { - "__id__": 883 + "__id__": 891 }, { - "__id__": 885 + "__id__": 893 }, { - "__id__": 887 + "__id__": 895 } ], "_prefab": { - "__id__": 889 + "__id__": 897 }, "_lpos": { "__type__": "cc.Vec3", @@ -19421,27 +19620,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 837 + "__id__": 845 }, "_children": [ { - "__id__": 839 + "__id__": 847 } ], "_active": true, "_components": [ { - "__id__": 845 + "__id__": 853 }, { - "__id__": 847 + "__id__": 855 }, { - "__id__": 849 + "__id__": 857 } ], "_prefab": { - "__id__": 852 + "__id__": 860 }, "_lpos": { "__type__": "cc.Vec3", @@ -19478,20 +19677,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 838 + "__id__": 846 }, "_children": [], "_active": true, "_components": [ { - "__id__": 840 + "__id__": 848 }, { - "__id__": 842 + "__id__": 850 } ], "_prefab": { - "__id__": 844 + "__id__": 852 }, "_lpos": { "__type__": "cc.Vec3", @@ -19528,11 +19727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 847 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 849 }, "_contentSize": { "__type__": "cc.Size", @@ -19556,11 +19755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 847 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 851 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19637,11 +19836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 846 }, "_enabled": true, "__prefab": { - "__id__": 846 + "__id__": 854 }, "_contentSize": { "__type__": "cc.Size", @@ -19665,11 +19864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 846 }, "_enabled": true, "__prefab": { - "__id__": 848 + "__id__": 856 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19713,15 +19912,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 846 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 858 }, "clickEvents": [ { - "__id__": 851 + "__id__": 859 } ], "_interactable": true, @@ -19796,27 +19995,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 837 + "__id__": 845 }, "_children": [ { - "__id__": 854 + "__id__": 862 } ], "_active": true, "_components": [ { - "__id__": 860 + "__id__": 868 }, { - "__id__": 862 + "__id__": 870 }, { - "__id__": 864 + "__id__": 872 } ], "_prefab": { - "__id__": 867 + "__id__": 875 }, "_lpos": { "__type__": "cc.Vec3", @@ -19853,20 +20052,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 861 }, "_children": [], "_active": true, "_components": [ { - "__id__": 855 + "__id__": 863 }, { - "__id__": 857 + "__id__": 865 } ], "_prefab": { - "__id__": 859 + "__id__": 867 }, "_lpos": { "__type__": "cc.Vec3", @@ -19903,11 +20102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 856 + "__id__": 864 }, "_contentSize": { "__type__": "cc.Size", @@ -19931,11 +20130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 866 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20012,11 +20211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 861 + "__id__": 869 }, "_contentSize": { "__type__": "cc.Size", @@ -20040,11 +20239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 871 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20088,15 +20287,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 873 }, "clickEvents": [ { - "__id__": 866 + "__id__": 874 } ], "_interactable": true, @@ -20171,27 +20370,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 837 + "__id__": 845 }, "_children": [ { - "__id__": 869 + "__id__": 877 } ], "_active": false, "_components": [ { - "__id__": 875 + "__id__": 883 }, { - "__id__": 877 + "__id__": 885 }, { - "__id__": 879 + "__id__": 887 } ], "_prefab": { - "__id__": 882 + "__id__": 890 }, "_lpos": { "__type__": "cc.Vec3", @@ -20228,20 +20427,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 868 + "__id__": 876 }, "_children": [], "_active": true, "_components": [ { - "__id__": 870 + "__id__": 878 }, { - "__id__": 872 + "__id__": 880 } ], "_prefab": { - "__id__": 874 + "__id__": 882 }, "_lpos": { "__type__": "cc.Vec3", @@ -20278,11 +20477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 877 }, "_enabled": true, "__prefab": { - "__id__": 871 + "__id__": 879 }, "_contentSize": { "__type__": "cc.Size", @@ -20306,11 +20505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 877 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 881 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20387,11 +20586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 876 + "__id__": 884 }, "_contentSize": { "__type__": "cc.Size", @@ -20415,11 +20614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 878 + "__id__": 886 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20463,15 +20662,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 888 }, "clickEvents": [ { - "__id__": 881 + "__id__": 889 } ], "_interactable": true, @@ -20546,11 +20745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 845 }, "_enabled": true, "__prefab": { - "__id__": 884 + "__id__": 892 }, "_contentSize": { "__type__": "cc.Size", @@ -20574,11 +20773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 845 }, "_enabled": true, "__prefab": { - "__id__": 886 + "__id__": 894 }, "_resizeMode": 1, "_layoutType": 1, @@ -20612,11 +20811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 845 }, "_enabled": true, "__prefab": { - "__id__": 888 + "__id__": 896 }, "_alignFlags": 4, "_target": null, @@ -20662,14 +20861,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 891 + "__id__": 899 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 890 + "__id__": 898 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -20677,7 +20876,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 892 + "__id__": 900 }, "targetOverrides": null }, @@ -20690,26 +20889,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 893 - }, - { - "__id__": 895 - }, - { - "__id__": 896 - }, - { - "__id__": 897 - }, - { - "__id__": 898 - }, - { - "__id__": 899 - }, { "__id__": 901 + }, + { + "__id__": 903 + }, + { + "__id__": 904 + }, + { + "__id__": 905 + }, + { + "__id__": 906 + }, + { + "__id__": 907 + }, + { + "__id__": 909 } ], "removedComponents": [] @@ -20717,7 +20916,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 894 + "__id__": 902 }, "propertyPath": [ "_name" @@ -20733,7 +20932,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 894 + "__id__": 902 }, "propertyPath": [ "_lpos" @@ -20748,7 +20947,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 894 + "__id__": 902 }, "propertyPath": [ "_lrot" @@ -20764,7 +20963,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 894 + "__id__": 902 }, "propertyPath": [ "_euler" @@ -20779,7 +20978,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 894 + "__id__": 902 }, "propertyPath": [ "_active" @@ -20789,7 +20988,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 900 + "__id__": 908 }, "propertyPath": [ "_contentSize" @@ -20809,7 +21008,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 902 + "__id__": 910 }, "propertyPath": [ "_contentSize" @@ -20836,7 +21035,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 912 }, "_contentSize": { "__type__": "cc.Size", @@ -20864,13 +21063,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 914 }, "mvp_node": { - "__id__": 334 + "__id__": 342 }, "total_score_label": { - "__id__": 273 + "__id__": 281 }, "combat_node": { "__id__": 26 @@ -20888,7 +21087,7 @@ "__id__": 202 }, "highlights_container": { - "__id__": 798 + "__id__": 806 }, "highlight_prefab": { "__uuid__": "12df63de-cda7-4be2-8e23-ea387fbba6f5", @@ -20910,7 +21109,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 908 + "__id__": 916 }, "_alignFlags": 45, "_target": null, @@ -20946,7 +21145,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 910 + "__id__": 918 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20988,7 +21187,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 912 + "__id__": 920 }, "_id": "" }, @@ -21009,10 +21208,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 890 + "__id__": 898 }, { - "__id__": 492 + "__id__": 500 } ] } diff --git a/assets/script/game/common/LangUtil.ts b/assets/script/game/common/LangUtil.ts index fb3d9fea..34b903f4 100644 --- a/assets/script/game/common/LangUtil.ts +++ b/assets/script/game/common/LangUtil.ts @@ -23,67 +23,68 @@ * | hl_desc | 亮点成就描述 | hl_desc_9001 | 暴击{0}次 | * * === 使用示例 === - * import { lang, langf } from "../common/LangUtil"; + * import { LangPrefix, lang, langf } from "../common/LangUtil"; * * // 英雄 - * lang("hero_name", 5001) // → "盾战士" - * langf("skill_info", 6001, 1, 100) // → "对单个目标攻击1次,每次造成100%攻击的伤害" + * lang(LangPrefix.hero_name, 5001) // → "盾战士" + * langf(LangPrefix.skill_info, 6001, 1, 100) // → "对单个目标攻击1次,每次造成100%攻击的伤害" * * // 驻场技能 - * lang("fskill_name", 7001) // → "召唤精通" - * langf("fskill_info", 7001, 1) // → "场上所有友方召唤触发技能触发次数+1" + * lang(LangPrefix.fskill_name, 7001) // → "召唤精通" + * langf(LangPrefix.fskill_info, 7001, 1) // → "场上所有友方召唤触发技能触发次数+1" * * // 亮点成就(与英雄/技能完全一致的调用方式) - * lang("hl_name", 9001) // → "暴击大师" - * langf("hl_desc", 9001, 20) // → "暴击20次" + * lang(LangPrefix.hl_title, 9011) // → "初级暴击者" + * langf(LangPrefix.hl_desc, 9011, 20) // → "暴击20次" */ import { oops } from "db://oops-framework/core/Oops"; -export type LangPrefix = - | "hero_name" - | "hero_info" - | "mon_name" - | "skill_name" - | "skill_info" - | "fskill_name" - | "fskill_info" - | "scard_name" - | "scard_info" - | "hl_name" - | "hl_desc"; +export enum LangPrefix { + hero_name = "hero_name", + hero_info = "hero_info", + mon_name = "mon_name", + skill_name = "skill_name", + skill_info = "skill_info", + fskill_name = "fskill_name", + fskill_info = "fskill_info", + scard_name = "scard_name", + scard_info = "scard_info", + hl_title = "hl_title", + hl_desc = "hl_desc", +} -function buildKey(prefix: LangPrefix, uuid: number | string): string { +function buildKey(prefix: string, uuid: number | string): string { return `${prefix}_${uuid}`; } /** * 按前缀+uuid获取多语言文本 - * @param prefix 类型前缀,如 "hero_name"、"skill_info"、"hl_name" + * @param prefix 类型前缀,推荐使用 LangPrefix 枚举 * @param uuid 唯一标识 * @returns 翻译后的文本,找不到则返回 key 本身 * * @example - * lang("hero_name", 5001) // → "盾战士" - * lang("skill_name", 6002) // → "火球术" - * lang("hl_title", 9011) // → "初级暴击者" + * lang(LangPrefix.hero_name, 5001) // → "盾战士" + * lang(LangPrefix.skill_name, 6002) // → "火球术" + * lang(LangPrefix.hl_title, 9011) // → "初级暴击者" */ -export function lang(prefix: LangPrefix, uuid: number | string): string { +export function lang(prefix: string, uuid: number | string): string { const key = buildKey(prefix, uuid); return oops.language.getLangByID(key) || key; } /** * 按前缀+uuid获取多语言文本,并替换 {0} {1} ... 占位符 - * @param prefix 类型前缀 + * @param prefix 类型前缀,推荐使用 LangPrefix 枚举 * @param uuid 唯一标识 * @param params 模板参数,按顺序替换 {0} {1} ... * @returns 翻译并替换参数后的文本 * * @example - * langf("skill_info", 6001, 1, 100) // → "对单个目标攻击1次,每次造成100%攻击的伤害" - * langf("hl_desc", 9001, 20) // → "暴击20次" + * langf(LangPrefix.skill_info, 6001, 1, 100) // → "对单个目标攻击1次,每次造成100%攻击的伤害" + * langf(LangPrefix.hl_desc, 9011, 20) // → "暴击20次" */ -export function langf(prefix: LangPrefix, uuid: number | string, ...params: any[]): string { +export function langf(prefix: string, uuid: number | string, ...params: any[]): string { const key = buildKey(prefix, uuid); let str = oops.language.getLangByID(key) || key; if (params && params.length > 0) { diff --git a/assets/script/game/common/LangUtil.ts.meta b/assets/script/game/common/LangUtil.ts.meta new file mode 100644 index 00000000..0a49177a --- /dev/null +++ b/assets/script/game/common/LangUtil.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "0790610b-af83-4922-ae8c-3b1ced9ff472", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/common/config/HighlightSet.ts b/assets/script/game/common/config/HighlightSet.ts index 41b394c4..4a1e3205 100644 --- a/assets/script/game/common/config/HighlightSet.ts +++ b/assets/script/game/common/config/HighlightSet.ts @@ -17,9 +17,9 @@ * 9091~9095 = ThriftyPlayer 节俭玩家 * * 多语言调用方式(与英雄/技能统一): - * import { lang, langf } from "../common/LangUtil"; - * lang("hl_title", 9011) // → "初级暴击者" - * langf("hl_desc", 9011, 20) // → "暴击20次" + * import { LangPrefix, lang, langf } from "../common/LangUtil"; + * lang(LangPrefix.hl_title, 9011) // → "初级暴击者" + * langf(LangPrefix.hl_desc, 9011, 20) // → "暴击20次" */ export enum HighlightType { diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index 4a61448f..ca86de80 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -2,21 +2,7 @@ * @file VictoryComp.ts * @description 战斗结算弹窗组件(UI 视图层) * - * 职责: - * 1. 在战斗结束时弹出,展示结算信息(得分、奖励)。 - * 2. 根据传入参数判断是否可复活,切换"下一步"或"复活"按钮。 - * 3. 计算单局总分并存储到 smc.vmdata.scores.score。 - * 4. 提供"重新开始"和"退出"两个操作入口。 - * - * 关键设计: - * - onAdded(args) 接收战斗结果参数(victory / rewards / game_data / can_revive)。 - * - calculateTotalScore() 根据 ScoreWeights 配置加权计算各项得分。 - * - restart() 和 victory_end() 通过分发 MissionEnd / MissionStart 事件驱动游戏状态切换。 - * - * 依赖: - * - smc.vmdata.scores —— 全局战斗统计数据 - * - ScoreWeights(ScoreSet)—— 得分权重配置 - * - GameEvent.MissionEnd / MissionStart —— 游戏生命周期事件 + */ import { _decorator, instantiate, Label ,Prefab,Node, Sprite, Animation, AnimationClip, resources, UITransform, Widget, ProgressBar } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; @@ -24,15 +10,12 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; import { GameEvent } from "../common/config/GameEvent"; -import { it } from "node:test"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; -import { HeroViewComp } from "../hero/HeroViewComp"; import { FacSet } from "../common/config/GameSet"; -import { Attrs } from "../common/config/HeroAttrs"; import { HeroInfo } from "../common/config/heroSet"; import { CKind } from "../common/config/CardSet"; -import { ScoreWeights } from "../common/config/ScoreSet"; import { HighlightSet, HighlightType, HighlightLevel } from "../common/config/HighlightSet"; +import { LangPrefix, lang, langf } from "../common/LangUtil"; import { mLogger } from "../common/Logger"; import { UIID } from "../common/config/GameUIConfig"; @@ -505,11 +488,11 @@ export class VictoryComp extends CCComp { }; // TODO: 进度条的最大值可按设计期望自行调整,目前为占位预估值 - renderDim(this.combat_node, s.score_combat, 3000); - renderDim(this.output_node, s.score_output, 3000); - renderDim(this.defense_node, s.score_defense, 1500); - renderDim(this.build_node, s.score_build, 1000); - renderDim(this.efficiency_node, s.score_efficiency, 200); + // renderDim(this.combat_node, s.score_combat, 3000); + // renderDim(this.output_node, s.score_output, 3000); + // renderDim(this.defense_node, s.score_defense, 1500); + // renderDim(this.build_node, s.score_build, 1000); + // renderDim(this.efficiency_node, s.score_efficiency, 200); // 渲染成就亮点标签 this.renderHighlights(); @@ -536,15 +519,14 @@ export class VictoryComp extends CCComp { const lab = tagNode.getComponent(Label) || tagNode.getChildByName("label")?.getComponent(Label); if (lab) { - // 获取主配置和等级配置 const typeConfig = HighlightSet[item.type]; const levelConfig = item.config; - - // 格式化描述(替换占位符 {0} 为实际所需达成的阈值或当前值) - let descStr = levelConfig.desc.replace("{0}", levelConfig.threshold.toString()); - - // 显示:[图标] 称号 (描述) - lab.string = `${typeConfig.icon} ${levelConfig.title} (${descStr})`; + const uuid = levelConfig.uuid; + + const titleStr = lang(LangPrefix.hl_title, uuid); + const descStr = langf(LangPrefix.hl_desc, uuid, levelConfig.threshold); + + lab.string = `${typeConfig.icon} ${titleStr} (${descStr})`; } this.highlights_container.addChild(tagNode); });