From bb098d690b4c4561c40301dcf2e1cc47b0a9f976 Mon Sep 17 00:00:00 2001 From: pan Date: Mon, 24 Aug 2026 11:16:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B5=8B=E8=AF=95=E6=A8=A1=E6=8B=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B9=B6=E4=BF=AE=E5=A4=8DUI=E9=A2=84=E5=88=B6?= =?UTF-8?q?=E4=BB=B6=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为英雄成长数据添加测试用模拟数据,用于验证英雄升级功能 2. 修复role_controller预制件的hero_btn和tals_btn控件绑定 3. 调整cHero预制件的控件结构与关联关系 --- assets/resources/gui/element/cHero.prefab | 1247 +------------ assets/resources/gui/element/heros.prefab | 1541 +++++++++-------- assets/resources/gui/role_controller.prefab | 8 +- .../script/game/common/SingletonModuleComp.ts | 12 +- 4 files changed, 854 insertions(+), 1954 deletions(-) diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab index 1c7fdb6f..e1ff6566 100644 --- a/assets/resources/gui/element/cHero.prefab +++ b/assets/resources/gui/element/cHero.prefab @@ -53,7 +53,7 @@ } ], "_prefab": { - "__id__": 384 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -4394,9 +4394,7 @@ "__id__": 68 }, "buy_node": null, - "cost_label": { - "__id__": 334 - }, + "cost_label": null, "_id": "" }, { @@ -5342,1214 +5340,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 335 - }, - "_enabled": true, - "__prefab": { - "__id__": 383 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "2", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_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.Node", - "_name": "num", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 336 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 380 - }, - { - "__id__": 334 - } - ], - "_prefab": { - "__id__": 382 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 13.5, - "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.Node", - "_name": "coin", - "_objFlags": 0, - "__editorExtras__": { - "mountedRoot": null - }, - "_parent": { - "__id__": 337 - }, - "_children": [ - { - "__id__": 369 - }, - { - "__id__": 335 - } - ], - "_active": false, - "_components": [ - { - "__id__": 375 - }, - { - "__id__": 377 - } - ], - "_prefab": { - "__id__": 379 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -17.75, - "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.Node", - "_name": "Node", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 240 - }, - "_children": [ - { - "__id__": 338 - }, - { - "__id__": 336 - }, - { - "__id__": 344 - } - ], - "_active": true, - "_components": [ - { - "__id__": 362 - }, - { - "__id__": 364 - }, - { - "__id__": 366 - } - ], - "_prefab": { - "__id__": 368 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0.5125000000000028, - "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.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": { - "mountedRoot": null - }, - "_parent": { - "__id__": 337 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 339 - }, - { - "__id__": 341 - } - ], - "_prefab": { - "__id__": 343 - }, - "_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__": 338 - }, - "_enabled": true, - "__prefab": { - "__id__": 340 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 54, - "height": 35.5 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a4sqCI1VpI8YJnOwF8QknG" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 338 - }, - "_enabled": true, - "__prefab": { - "__id__": 342 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "选择", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, - "_fontFamily": "Arial", - "_lineHeight": 25, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_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": "cea0FpTiVBEprBOaYQFSav" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "28D4tFgVRPwbG9iXo3cRl7", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "stone", - "_objFlags": 0, - "__editorExtras__": { - "mountedRoot": null - }, - "_parent": { - "__id__": 337 - }, - "_children": [ - { - "__id__": 345 - }, - { - "__id__": 351 - } - ], - "_active": false, - "_components": [ - { - "__id__": 357 - }, - { - "__id__": 359 - } - ], - "_prefab": { - "__id__": 361 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -32.75, - "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.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 344 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 346 - }, - { - "__id__": 348 - } - ], - "_prefab": { - "__id__": 350 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -7.5615234375, - "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__": 345 - }, - "_enabled": true, - "__prefab": { - "__id__": 347 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 27, - "height": 27 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "31GJSeBupAjL6B0JSMWEDn" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 345 - }, - "_enabled": true, - "__prefab": { - "__id__": 349 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@66d28", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f0Ah1lXhpLIZry/aPq9YzL" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d5mcu1TmRMYpCqlMi96hsO", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "num", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 344 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 352 - }, - { - "__id__": 354 - } - ], - "_prefab": { - "__id__": 356 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 13.5, - "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__": 351 - }, - "_enabled": true, - "__prefab": { - "__id__": 353 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 15.123046875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "94OK1DwMRAl7qOBrTxG/i4" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 351 - }, - "_enabled": true, - "__prefab": { - "__id__": 355 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "2", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_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": "38htj7TVBI84FdhXPqZi9Y" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5aV+d4uupA3430zZytYs+/", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 344 - }, - "_enabled": true, - "__prefab": { - "__id__": 358 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 42.123046875, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "daubq3MHBCvZhVT7CCunA4" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 344 - }, - "_enabled": true, - "__prefab": { - "__id__": 360 - }, - "_resizeMode": 1, - "_layoutType": 1, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 0, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "867zQklidJAJ9K6dAQWCB6" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "32ZgIQHstCXYwNDGBH6HPk", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 337 - }, - "_enabled": true, - "__prefab": { - "__id__": 363 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 230, - "height": 35.5 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2VyIJeeVKFodz6H9a3PKt" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 337 - }, - "_enabled": true, - "__prefab": { - "__id__": 365 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 16.7375, - "_bottom": 17.762500000000003, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "71o6/V/3VMMZ/CnSZBIkZ0" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 337 - }, - "_enabled": true, - "__prefab": { - "__id__": 367 - }, - "_resizeMode": 1, - "_layoutType": 2, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 0, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "78A6Dkiv9F64eccErjGFxK" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "59HmW0DT5L74QSaNhJXq7r", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 336 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 370 - }, - { - "__id__": 372 - } - ], - "_prefab": { - "__id__": 374 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -7.5615234375, - "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__": 369 - }, - "_enabled": true, - "__prefab": { - "__id__": 371 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 27, - "height": 27 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "39O3Ak8hhKxKF4zeoDUgVQ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 369 - }, - "_enabled": true, - "__prefab": { - "__id__": 373 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@ec5a5", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_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": "fb5HbJnLdPp5vG2ekEjx0W" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "6aPcHyYFpJtqTknWOBQjrH", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 376 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 42.123046875, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e03E8E9MNHWqlyzsRwdhQj" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 378 - }, - "_resizeMode": 1, - "_layoutType": 1, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 0, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "306oiXmUNKlqXJd/x4wic4" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "deRkP/BNlLX52OUGvpThIO", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 335 - }, - "_enabled": true, - "__prefab": { - "__id__": 381 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 15.123046875, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3dJ0AU7pFORpdUaZBM3Z/u" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "bfLo+sXdxPSY6pJ+TTshHA", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9deqZrZeZEEKkvtD7QlGHO" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -6562,13 +5352,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 385 + "__id__": 335 }, { - "__id__": 387 - }, - { - "__id__": 389 + "__id__": 337 } ], "nestedPrefabInstanceRoots": [ @@ -6596,7 +5383,7 @@ "__id__": 84 }, "targetInfo": { - "__id__": 386 + "__id__": 336 } }, { @@ -6605,28 +5392,6 @@ "93wpdyvytKPqGrBBUDf293" ] }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 290 - }, - "sourceInfo": null, - "propertyPath": [ - "cost_label" - ], - "target": { - "__id__": 240 - }, - "targetInfo": { - "__id__": 388 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9deqZrZeZEEKkvtD7QlGHO" - ] - }, { "__type__": "cc.TargetOverrideInfo", "source": { @@ -6638,7 +5403,7 @@ "__id__": 240 }, "targetInfo": { - "__id__": 390 + "__id__": 338 } }, { diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 6ff9b9b5..c086941f 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,29 +25,32 @@ "__id__": 88 }, { - "__id__": 509 + "__id__": 515 }, { - "__id__": 523 + "__id__": 529 }, { - "__id__": 621 + "__id__": 627 } ], "_active": true, "_components": [ { - "__id__": 629 + "__id__": 635 }, { - "__id__": 631 + "__id__": 637 }, { - "__id__": 633 + "__id__": 639 + }, + { + "__id__": 641 } ], "_prefab": { - "__id__": 635 + "__id__": 643 }, "_lpos": { "__type__": "cc.Vec3", @@ -1254,31 +1257,31 @@ "__id__": 89 }, { - "__id__": 194 + "__id__": 196 }, { - "__id__": 370 + "__id__": 372 }, { - "__id__": 392 + "__id__": 394 } ], "_active": true, "_components": [ { - "__id__": 504 + "__id__": 510 }, { - "__id__": 506 + "__id__": 512 } ], "_prefab": { - "__id__": 508 + "__id__": 514 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 455.0319999999999, + "y": 105, "z": 0 }, "_lrot": { @@ -1333,15 +1336,18 @@ "_components": [ { "__id__": 191 + }, + { + "__id__": 193 } ], "_prefab": { - "__id__": 193 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -198.041, + "y": 185, "z": 0 }, "_lrot": { @@ -3606,6 +3612,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d24DoPtt1GBbw2iGk0R97E" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 194 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 150, + "_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": "45FKeXT5FDMJ89adBC15Bu" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3629,37 +3671,37 @@ }, "_children": [ { - "__id__": 195 + "__id__": 197 }, { - "__id__": 237 + "__id__": 239 }, { - "__id__": 279 + "__id__": 281 }, { - "__id__": 321 + "__id__": 323 } ], "_active": true, "_components": [ - { - "__id__": 363 - }, { "__id__": 365 }, { "__id__": 367 + }, + { + "__id__": 369 } ], "_prefab": { - "__id__": 369 + "__id__": 371 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -372.919, + "y": 0, "z": 0 }, "_lrot": { @@ -3691,30 +3733,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 194 + "__id__": 196 }, "_children": [ { - "__id__": 196 + "__id__": 198 }, { - "__id__": 204 + "__id__": 206 } ], "_active": true, "_components": [ - { - "__id__": 230 - }, { "__id__": 232 }, { "__id__": 234 + }, + { + "__id__": 236 } ], "_prefab": { - "__id__": 236 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -3751,23 +3793,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 195 + "__id__": 197 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 197 - }, { "__id__": 199 }, { "__id__": 201 + }, + { + "__id__": 203 } ], "_prefab": { - "__id__": 203 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -3804,11 +3846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -3832,11 +3874,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3880,11 +3922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 204 }, "_alignFlags": 45, "_target": null, @@ -3929,24 +3971,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 195 + "__id__": 197 }, "_children": [ { - "__id__": 205 + "__id__": 207 }, { - "__id__": 211 + "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 227 + "__id__": 229 } ], "_prefab": { - "__id__": 229 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -3983,20 +4025,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 206 + "__id__": 208 }, { - "__id__": 208 + "__id__": 210 } ], "_prefab": { - "__id__": 210 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -4033,11 +4075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -4061,11 +4103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4122,24 +4164,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 212 + "__id__": 214 }, { - "__id__": 218 + "__id__": 220 } ], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 226 } ], "_prefab": { - "__id__": 226 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4176,20 +4218,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 211 + "__id__": 213 }, "_children": [], "_active": true, "_components": [ { - "__id__": 213 + "__id__": 215 }, { - "__id__": 215 + "__id__": 217 } ], "_prefab": { - "__id__": 217 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -4226,11 +4268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 212 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 216 }, "_contentSize": { "__type__": "cc.Size", @@ -4254,11 +4296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 212 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4335,20 +4377,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 211 + "__id__": 213 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 221 }, { - "__id__": 221 + "__id__": 223 } ], "_prefab": { - "__id__": 223 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -4385,11 +4427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -4413,11 +4455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4494,11 +4536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -4535,11 +4577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4576,11 +4618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -4604,11 +4646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 197 }, "_enabled": false, "__prefab": { - "__id__": 233 + "__id__": 235 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4649,11 +4691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 197 }, "_enabled": false, "__prefab": { - "__id__": 235 + "__id__": 237 }, "_alignFlags": 44, "_target": null, @@ -4698,30 +4740,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 194 + "__id__": 196 }, "_children": [ { - "__id__": 238 + "__id__": 240 }, { - "__id__": 246 + "__id__": 248 } ], "_active": true, "_components": [ - { - "__id__": 272 - }, { "__id__": 274 }, { "__id__": 276 + }, + { + "__id__": 278 } ], "_prefab": { - "__id__": 278 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -4758,23 +4800,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 239 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 239 - }, { "__id__": 241 }, { "__id__": 243 + }, + { + "__id__": 245 } ], "_prefab": { - "__id__": 245 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -4811,11 +4853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -4839,11 +4881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4887,11 +4929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 246 }, "_alignFlags": 45, "_target": null, @@ -4936,24 +4978,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 239 }, "_children": [ { - "__id__": 247 + "__id__": 249 }, { - "__id__": 253 + "__id__": 255 } ], "_active": true, "_components": [ { - "__id__": 269 + "__id__": 271 } ], "_prefab": { - "__id__": 271 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -4990,20 +5032,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 246 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 248 + "__id__": 250 }, { - "__id__": 250 + "__id__": 252 } ], "_prefab": { - "__id__": 252 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -5040,11 +5082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -5068,11 +5110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5129,24 +5171,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 246 + "__id__": 248 }, "_children": [ { - "__id__": 254 + "__id__": 256 }, { - "__id__": 260 + "__id__": 262 } ], "_active": true, "_components": [ { - "__id__": 266 + "__id__": 268 } ], "_prefab": { - "__id__": 268 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -5183,20 +5225,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 255 + "__id__": 257 }, { - "__id__": 257 + "__id__": 259 } ], "_prefab": { - "__id__": 259 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", @@ -5233,11 +5275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -5261,11 +5303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5342,20 +5384,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 261 + "__id__": 263 }, { - "__id__": 263 + "__id__": 265 } ], "_prefab": { - "__id__": 265 + "__id__": 267 }, "_lpos": { "__type__": "cc.Vec3", @@ -5392,11 +5434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 262 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 264 }, "_contentSize": { "__type__": "cc.Size", @@ -5420,11 +5462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 262 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 266 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5501,11 +5543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -5542,11 +5584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5583,11 +5625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -5611,11 +5653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 239 }, "_enabled": false, "__prefab": { - "__id__": 275 + "__id__": 277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5656,11 +5698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 239 }, "_enabled": false, "__prefab": { - "__id__": 277 + "__id__": 279 }, "_alignFlags": 44, "_target": null, @@ -5705,30 +5747,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 194 + "__id__": 196 }, "_children": [ { - "__id__": 280 + "__id__": 282 }, { - "__id__": 288 + "__id__": 290 } ], "_active": true, "_components": [ - { - "__id__": 314 - }, { "__id__": 316 }, { "__id__": 318 + }, + { + "__id__": 320 } ], "_prefab": { - "__id__": 320 + "__id__": 322 }, "_lpos": { "__type__": "cc.Vec3", @@ -5765,23 +5807,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 281 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 281 - }, { "__id__": 283 }, { "__id__": 285 + }, + { + "__id__": 287 } ], "_prefab": { - "__id__": 287 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", @@ -5818,11 +5860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -5846,11 +5888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5894,11 +5936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 288 }, "_alignFlags": 45, "_target": null, @@ -5943,24 +5985,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 281 }, "_children": [ { - "__id__": 289 + "__id__": 291 }, { - "__id__": 295 + "__id__": 297 } ], "_active": true, "_components": [ { - "__id__": 311 + "__id__": 313 } ], "_prefab": { - "__id__": 313 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -5997,20 +6039,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 290 }, "_children": [], "_active": true, "_components": [ { - "__id__": 290 + "__id__": 292 }, { - "__id__": 292 + "__id__": 294 } ], "_prefab": { - "__id__": 294 + "__id__": 296 }, "_lpos": { "__type__": "cc.Vec3", @@ -6047,11 +6089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 293 }, "_contentSize": { "__type__": "cc.Size", @@ -6075,11 +6117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6136,24 +6178,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 290 }, "_children": [ { - "__id__": 296 + "__id__": 298 }, { - "__id__": 302 + "__id__": 304 } ], "_active": true, "_components": [ { - "__id__": 308 + "__id__": 310 } ], "_prefab": { - "__id__": 310 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -6190,20 +6232,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 295 + "__id__": 297 }, "_children": [], "_active": true, "_components": [ { - "__id__": 297 + "__id__": 299 }, { - "__id__": 299 + "__id__": 301 } ], "_prefab": { - "__id__": 301 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", @@ -6240,11 +6282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 300 }, "_contentSize": { "__type__": "cc.Size", @@ -6268,11 +6310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 302 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6349,20 +6391,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 295 + "__id__": 297 }, "_children": [], "_active": true, "_components": [ { - "__id__": 303 + "__id__": 305 }, { - "__id__": 305 + "__id__": 307 } ], "_prefab": { - "__id__": 307 + "__id__": 309 }, "_lpos": { "__type__": "cc.Vec3", @@ -6399,11 +6441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -6427,11 +6469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 308 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6508,11 +6550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 297 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 311 }, "_contentSize": { "__type__": "cc.Size", @@ -6549,11 +6591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -6590,11 +6632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 317 }, "_contentSize": { "__type__": "cc.Size", @@ -6618,11 +6660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 281 }, "_enabled": false, "__prefab": { - "__id__": 317 + "__id__": 319 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6663,11 +6705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 281 }, "_enabled": false, "__prefab": { - "__id__": 319 + "__id__": 321 }, "_alignFlags": 44, "_target": null, @@ -6712,30 +6754,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 194 + "__id__": 196 }, "_children": [ { - "__id__": 322 + "__id__": 324 }, { - "__id__": 330 + "__id__": 332 } ], "_active": true, "_components": [ - { - "__id__": 356 - }, { "__id__": 358 }, { "__id__": 360 + }, + { + "__id__": 362 } ], "_prefab": { - "__id__": 362 + "__id__": 364 }, "_lpos": { "__type__": "cc.Vec3", @@ -6772,23 +6814,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 323 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 323 - }, { "__id__": 325 }, { "__id__": 327 + }, + { + "__id__": 329 } ], "_prefab": { - "__id__": 329 + "__id__": 331 }, "_lpos": { "__type__": "cc.Vec3", @@ -6825,11 +6867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -6853,11 +6895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6901,11 +6943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 330 }, "_alignFlags": 45, "_target": null, @@ -6950,24 +6992,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 323 }, "_children": [ { - "__id__": 331 + "__id__": 333 }, { - "__id__": 337 + "__id__": 339 } ], "_active": true, "_components": [ { - "__id__": 353 + "__id__": 355 } ], "_prefab": { - "__id__": 355 + "__id__": 357 }, "_lpos": { "__type__": "cc.Vec3", @@ -7004,20 +7046,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 330 + "__id__": 332 }, "_children": [], "_active": true, "_components": [ { - "__id__": 332 + "__id__": 334 }, { - "__id__": 334 + "__id__": 336 } ], "_prefab": { - "__id__": 336 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -7054,11 +7096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -7082,11 +7124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7143,24 +7185,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 330 + "__id__": 332 }, "_children": [ { - "__id__": 338 + "__id__": 340 }, { - "__id__": 344 + "__id__": 346 } ], "_active": true, "_components": [ { - "__id__": 350 + "__id__": 352 } ], "_prefab": { - "__id__": 352 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -7197,20 +7239,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 341 }, { - "__id__": 341 + "__id__": 343 } ], "_prefab": { - "__id__": 343 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -7247,11 +7289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -7275,11 +7317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7356,20 +7398,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 345 + "__id__": 347 }, { - "__id__": 347 + "__id__": 349 } ], "_prefab": { - "__id__": 349 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -7406,11 +7448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", @@ -7434,11 +7476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7515,11 +7557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 339 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 353 }, "_contentSize": { "__type__": "cc.Size", @@ -7556,11 +7598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -7597,11 +7639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -7625,11 +7667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 323 }, "_enabled": false, "__prefab": { - "__id__": 359 + "__id__": 361 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7670,11 +7712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 323 }, "_enabled": false, "__prefab": { - "__id__": 361 + "__id__": 363 }, "_alignFlags": 44, "_target": null, @@ -7719,11 +7761,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 366 }, "_contentSize": { "__type__": "cc.Size", @@ -7747,17 +7789,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 368 }, - "_alignFlags": 0, + "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": 380, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -7783,11 +7825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 370 }, "_resizeMode": 1, "_layoutType": 3, @@ -7838,31 +7880,31 @@ }, "_children": [ { - "__id__": 371 + "__id__": 373 }, { - "__id__": 379 + "__id__": 381 } ], "_active": true, "_components": [ - { - "__id__": 385 - }, { "__id__": 387 }, { "__id__": 389 + }, + { + "__id__": 391 } ], "_prefab": { - "__id__": 391 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -513.217, + "y": -175, "z": 0 }, "_lrot": { @@ -7894,23 +7936,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 370 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 372 - }, { "__id__": 374 }, { "__id__": 376 + }, + { + "__id__": 378 } ], "_prefab": { - "__id__": 378 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -7947,16 +7989,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", "width": 980, - "height": 310 + "height": 450 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7975,11 +8017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8023,11 +8065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 379 }, "_alignFlags": 45, "_target": null, @@ -8072,20 +8114,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 370 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ { - "__id__": 380 + "__id__": 382 }, { - "__id__": 382 + "__id__": 384 } ], "_prefab": { - "__id__": 384 + "__id__": 386 }, "_lpos": { "__type__": "cc.Vec3", @@ -8122,16 +8164,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", "width": 480, - "height": 140 + "height": 210 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8150,11 +8192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 385 }, "_alignFlags": 45, "_target": null, @@ -8199,16 +8241,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 370 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 388 }, "_contentSize": { "__type__": "cc.Size", "width": 490, - "height": 150 + "height": 220 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8227,18 +8269,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 370 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 390 }, - "_alignFlags": 0, + "_alignFlags": 5, "_target": null, "_left": 0, "_right": 0, - "_top": 0, - "_bottom": 0, + "_top": 500, + "_bottom": 150, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8248,7 +8290,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 0, - "_originalHeight": 0, + "_originalHeight": 150, "_alignMode": 2, "_lockFlags": 0, "_id": "" @@ -8263,11 +8305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 370 + "__id__": 372 }, "_enabled": false, "__prefab": { - "__id__": 390 + "__id__": 392 }, "_resizeMode": 1, "_layoutType": 3, @@ -8315,14 +8357,14 @@ "__id__": 88 }, "_prefab": { - "__id__": 393 + "__id__": 395 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 392 + "__id__": 394 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -8330,7 +8372,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 394 + "__id__": 396 }, "targetOverrides": null }, @@ -8342,32 +8384,27 @@ }, "mountedChildren": [ { - "__id__": 395 + "__id__": 397 } ], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 455 - }, + "mountedComponents": [ { "__id__": 457 + } + ], + "propertyOverrides": [ + { + "__id__": 461 }, { - "__id__": 458 - }, - { - "__id__": 459 - }, - { - "__id__": 460 - }, - { - "__id__": 462 + "__id__": 463 }, { "__id__": 464 }, + { + "__id__": 465 + }, { "__id__": 466 }, @@ -8375,13 +8412,13 @@ "__id__": 468 }, { - "__id__": 469 + "__id__": 470 }, { - "__id__": 471 + "__id__": 472 }, { - "__id__": 473 + "__id__": 474 }, { "__id__": 475 @@ -8390,13 +8427,13 @@ "__id__": 477 }, { - "__id__": 478 + "__id__": 479 }, { - "__id__": 480 + "__id__": 481 }, { - "__id__": 482 + "__id__": 483 }, { "__id__": 484 @@ -8404,38 +8441,47 @@ { "__id__": 486 }, - { - "__id__": 487 - }, { "__id__": 488 }, { - "__id__": 489 + "__id__": 490 }, { - "__id__": 491 + "__id__": 492 }, { "__id__": 493 }, + { + "__id__": 494 + }, { "__id__": 495 }, { - "__id__": 496 + "__id__": 497 }, { - "__id__": 498 - }, - { - "__id__": 500 + "__id__": 499 }, { "__id__": 501 }, { "__id__": 502 + }, + { + "__id__": 504 + }, + { + "__id__": 506 + }, + { + "__id__": 507 + }, + { + "__id__": 508 } ], "removedComponents": [] @@ -8443,11 +8489,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 396 + "__id__": 398 }, "nodes": [ { - "__id__": 397 + "__id__": 399 } ] }, @@ -8461,14 +8507,14 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 398 + "__id__": 400 }, "_prefab": { - "__id__": 448 + "__id__": 450 }, "__editorExtras__": { "mountedRoot": { - "__id__": 392 + "__id__": 394 } } }, @@ -8480,30 +8526,30 @@ "mountedRoot": null }, "_parent": { - "__id__": 399 + "__id__": 401 }, "_children": [ { - "__id__": 431 + "__id__": 433 }, { - "__id__": 437 + "__id__": 439 }, { - "__id__": 397 + "__id__": 399 } ], "_active": true, "_components": [ { - "__id__": 443 + "__id__": 445 }, { - "__id__": 445 + "__id__": 447 } ], "_prefab": { - "__id__": 447 + "__id__": 449 }, "_lpos": { "__type__": "cc.Vec3", @@ -8540,33 +8586,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 392 + "__id__": 394 }, "_children": [ - { - "__id__": 398 - }, { "__id__": 400 }, { - "__id__": 418 + "__id__": 402 + }, + { + "__id__": 420 } ], "_active": true, "_components": [ - { - "__id__": 424 - }, { "__id__": 426 }, { "__id__": 428 + }, + { + "__id__": 430 } ], "_prefab": { - "__id__": 430 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -8605,27 +8651,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 399 + "__id__": 401 }, "_children": [ { - "__id__": 401 + "__id__": 403 }, { - "__id__": 407 + "__id__": 409 } ], "_active": false, "_components": [ { - "__id__": 413 + "__id__": 415 }, { - "__id__": 415 + "__id__": 417 } ], "_prefab": { - "__id__": 417 + "__id__": 419 }, "_lpos": { "__type__": "cc.Vec3", @@ -8662,20 +8708,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 400 + "__id__": 402 }, "_children": [], "_active": true, "_components": [ { - "__id__": 402 + "__id__": 404 }, { - "__id__": 404 + "__id__": 406 } ], "_prefab": { - "__id__": 406 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", @@ -8712,11 +8758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 405 }, "_contentSize": { "__type__": "cc.Size", @@ -8740,11 +8786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 407 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8801,20 +8847,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 400 + "__id__": 402 }, "_children": [], "_active": true, "_components": [ { - "__id__": 408 + "__id__": 410 }, { - "__id__": 410 + "__id__": 412 } ], "_prefab": { - "__id__": 412 + "__id__": 414 }, "_lpos": { "__type__": "cc.Vec3", @@ -8851,11 +8897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 407 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 411 }, "_contentSize": { "__type__": "cc.Size", @@ -8879,11 +8925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 407 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 413 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8960,11 +9006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 416 }, "_contentSize": { "__type__": "cc.Size", @@ -8988,11 +9034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 400 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 418 }, "_resizeMode": 1, "_layoutType": 1, @@ -9041,20 +9087,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 399 + "__id__": 401 }, "_children": [], "_active": true, "_components": [ { - "__id__": 419 + "__id__": 421 }, { - "__id__": 421 + "__id__": 423 } ], "_prefab": { - "__id__": 423 + "__id__": 425 }, "_lpos": { "__type__": "cc.Vec3", @@ -9091,11 +9137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", @@ -9119,11 +9165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 418 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 424 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9200,11 +9246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 399 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 427 }, "_contentSize": { "__type__": "cc.Size", @@ -9228,11 +9274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 399 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 429 }, "_alignFlags": 45, "_target": null, @@ -9264,11 +9310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 399 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 431 }, "_resizeMode": 1, "_layoutType": 2, @@ -9315,20 +9361,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 398 + "__id__": 400 }, "_children": [], "_active": false, "_components": [ { - "__id__": 432 + "__id__": 434 }, { - "__id__": 434 + "__id__": 436 } ], "_prefab": { - "__id__": 436 + "__id__": 438 }, "_lpos": { "__type__": "cc.Vec3", @@ -9365,11 +9411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 435 }, "_contentSize": { "__type__": "cc.Size", @@ -9393,11 +9439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 433 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 437 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9451,20 +9497,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 398 + "__id__": 400 }, "_children": [], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 440 }, { - "__id__": 440 + "__id__": 442 } ], "_prefab": { - "__id__": 442 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", @@ -9501,11 +9547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 441 }, "_contentSize": { "__type__": "cc.Size", @@ -9529,11 +9575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 443 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9610,11 +9656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 444 + "__id__": 446 }, "_contentSize": { "__type__": "cc.Size", @@ -9638,11 +9684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 448 }, "_resizeMode": 1, "_layoutType": 1, @@ -9686,7 +9732,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 397 + "__id__": 399 }, "asset": { "__uuid__": "4b8fb686-b649-4525-9aae-df0e7369205b", @@ -9694,7 +9740,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 449 + "__id__": 451 }, "targetOverrides": null }, @@ -9707,17 +9753,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 450 - }, { "__id__": 452 }, { - "__id__": 453 + "__id__": 454 }, { - "__id__": 454 + "__id__": 455 + }, + { + "__id__": 456 } ], "removedComponents": [] @@ -9725,7 +9771,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 453 }, "propertyPath": [ "_name" @@ -9741,7 +9787,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 453 }, "propertyPath": [ "_lpos" @@ -9756,7 +9802,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 453 }, "propertyPath": [ "_lrot" @@ -9772,7 +9818,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 453 }, "propertyPath": [ "_euler" @@ -9784,10 +9830,67 @@ "z": 0 } }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 458 + }, + "components": [ + { + "__id__": 459 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "60RuUkpjBAGoLk3z4xlHcF" + ] + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 394 + } + }, + "node": { + "__id__": 394 + }, + "_enabled": true, + "__prefab": { + "__id__": 460 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 20, + "_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": "258eUDeitFhrlrD30Z5SrW" + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 + "__id__": 462 }, "propertyPath": [ "_name" @@ -9803,7 +9906,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 + "__id__": 462 }, "propertyPath": [ "_lpos" @@ -9811,14 +9914,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -673.509, + "y": -365, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 + "__id__": 462 }, "propertyPath": [ "_lrot" @@ -9834,7 +9937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 + "__id__": 462 }, "propertyPath": [ "_euler" @@ -9849,7 +9952,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 461 + "__id__": 467 }, "propertyPath": [ "_contentSize" @@ -9869,7 +9972,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 469 }, "propertyPath": [ "_contentSize" @@ -9889,7 +9992,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 465 + "__id__": 471 }, "propertyPath": [ "_contentSize" @@ -9909,7 +10012,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 473 }, "propertyPath": [ "_top" @@ -9925,7 +10028,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 473 }, "propertyPath": [ "_bottom" @@ -9935,7 +10038,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 476 }, "propertyPath": [ "_string" @@ -9951,7 +10054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 472 + "__id__": 478 }, "propertyPath": [ "_contentSize" @@ -9971,7 +10074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 474 + "__id__": 480 }, "propertyPath": [ "_name" @@ -9987,7 +10090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 482 }, "propertyPath": [ "_spriteFrame" @@ -10006,7 +10109,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 482 }, "propertyPath": [ "_atlas" @@ -10019,7 +10122,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 479 + "__id__": 485 }, "propertyPath": [ "_spacingY" @@ -10035,7 +10138,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 481 + "__id__": 487 }, "propertyPath": [ "_lpos" @@ -10056,7 +10159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 489 }, "propertyPath": [ "_lpos" @@ -10077,7 +10180,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 485 + "__id__": 491 }, "propertyPath": [ "_lpos" @@ -10098,7 +10201,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 476 }, "propertyPath": [ "_lineHeight" @@ -10108,7 +10211,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 476 }, "propertyPath": [ "_fontSize" @@ -10118,7 +10221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 476 }, "propertyPath": [ "_actualFontSize" @@ -10128,7 +10231,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 490 + "__id__": 496 }, "propertyPath": [ "_lpos" @@ -10149,7 +10252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 492 + "__id__": 498 }, "propertyPath": [ "_lpos" @@ -10170,7 +10273,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 494 + "__id__": 500 }, "propertyPath": [ "_contentSize" @@ -10190,7 +10293,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 490 + "__id__": 496 }, "propertyPath": [ "_active" @@ -10200,7 +10303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 503 }, "propertyPath": [ "_fontSize" @@ -10216,7 +10319,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 499 + "__id__": 505 }, "propertyPath": [ "_contentSize" @@ -10236,7 +10339,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 503 }, "propertyPath": [ "_actualFontSize" @@ -10246,7 +10349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 503 }, "propertyPath": [ "_string" @@ -10256,7 +10359,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 503 + "__id__": 509 }, "propertyPath": [ "_horizontalDirection" @@ -10279,12 +10382,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 511 }, "_contentSize": { "__type__": "cc.Size", "width": 710, - "height": 240 + "height": 870 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10307,14 +10410,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 513 }, - "_alignFlags": 41, + "_alignFlags": 45, "_target": null, "_left": 4.999999999999986, "_right": 5.000000000000014, - "_top": 64.96800000000007, - "_bottom": 1028.909, + "_top": 100, + "_bottom": 310, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -10356,25 +10459,25 @@ }, "_children": [ { - "__id__": 510 + "__id__": 516 } ], "_active": true, "_components": [ { - "__id__": 518 + "__id__": 524 }, { - "__id__": 520 + "__id__": 526 } ], "_prefab": { - "__id__": 522 + "__id__": 528 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -465, + "y": -508.98300000000006, "z": 0 }, "_lrot": { @@ -10406,23 +10509,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 509 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 511 + "__id__": 517 }, { - "__id__": 513 + "__id__": 519 }, { - "__id__": 515 + "__id__": 521 } ], "_prefab": { - "__id__": 517 + "__id__": 523 }, "_lpos": { "__type__": "cc.Vec3", @@ -10459,11 +10562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 516 }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 518 }, "_contentSize": { "__type__": "cc.Size", @@ -10487,11 +10590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 516 }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 520 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10535,11 +10638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 516 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 522 }, "_alignFlags": 45, "_target": null, @@ -10584,11 +10687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 519 + "__id__": 525 }, "_contentSize": { "__type__": "cc.Size", @@ -10612,18 +10715,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 527 }, "_alignFlags": 44, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": -43.98300000000006, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -10665,25 +10768,25 @@ }, "_children": [ { - "__id__": 524 + "__id__": 530 } ], "_active": true, "_components": [ { - "__id__": 616 + "__id__": 622 }, { - "__id__": 618 + "__id__": 624 } ], "_prefab": { - "__id__": 620 + "__id__": 626 }, "_lpos": { "__type__": "cc.Vec3", "x": -360, - "y": -417.384, + "y": -438.082, "z": 0 }, "_lrot": { @@ -10715,33 +10818,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 529 }, "_children": [ { - "__id__": 525 + "__id__": 531 }, { - "__id__": 543 + "__id__": 549 } ], "_active": true, "_components": [ { - "__id__": 609 + "__id__": 615 }, { - "__id__": 611 + "__id__": 617 }, { - "__id__": 540 + "__id__": 546 }, { - "__id__": 613 + "__id__": 619 } ], "_prefab": { - "__id__": 615 + "__id__": 621 }, "_lpos": { "__type__": "cc.Vec3", @@ -10778,30 +10881,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 524 + "__id__": 530 }, "_children": [ { - "__id__": 526 + "__id__": 532 } ], "_active": false, "_components": [ - { - "__id__": 532 - }, - { - "__id__": 534 - }, - { - "__id__": 536 - }, { "__id__": 538 + }, + { + "__id__": 540 + }, + { + "__id__": 542 + }, + { + "__id__": 544 } ], "_prefab": { - "__id__": 608 + "__id__": 614 }, "_lpos": { "__type__": "cc.Vec3", @@ -10838,20 +10941,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 525 + "__id__": 531 }, "_children": [], "_active": true, "_components": [ { - "__id__": 527 + "__id__": 533 }, { - "__id__": 529 + "__id__": 535 } ], "_prefab": { - "__id__": 531 + "__id__": 537 }, "_lpos": { "__type__": "cc.Vec3", @@ -10888,11 +10991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 526 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 534 }, "_contentSize": { "__type__": "cc.Size", @@ -10916,11 +11019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 526 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 536 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10974,11 +11077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 539 }, "_contentSize": { "__type__": "cc.Size", @@ -11002,11 +11105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 541 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11047,11 +11150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 543 }, "_alignFlags": 37, "_target": null, @@ -11083,17 +11186,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 545 }, "_scrollView": { - "__id__": 540 + "__id__": 546 }, "_handle": { - "__id__": 529 + "__id__": 535 }, "_direction": 1, "_enableAutoHide": false, @@ -11110,11 +11213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 547 }, "bounceDuration": 0.23, "brake": 0.75, @@ -11125,11 +11228,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 542 + "__id__": 548 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 538 + "__id__": 544 }, "_id": "" }, @@ -11143,42 +11246,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 543 + "__id__": 549 }, "_children": [ { - "__id__": 553 + "__id__": 559 }, { - "__id__": 561 + "__id__": 567 }, { - "__id__": 569 + "__id__": 575 }, { - "__id__": 577 + "__id__": 583 }, { - "__id__": 585 + "__id__": 591 }, { - "__id__": 593 + "__id__": 599 } ], "_active": true, "_components": [ { - "__id__": 601 + "__id__": 607 }, { - "__id__": 603 + "__id__": 609 }, { - "__id__": 605 + "__id__": 611 } ], "_prefab": { - "__id__": 607 + "__id__": 613 }, "_lpos": { "__type__": "cc.Vec3", @@ -11215,30 +11318,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 524 + "__id__": 530 }, "_children": [ { - "__id__": 542 + "__id__": 548 } ], "_active": true, "_components": [ - { - "__id__": 544 - }, - { - "__id__": 546 - }, - { - "__id__": 548 - }, { "__id__": 550 + }, + { + "__id__": 552 + }, + { + "__id__": 554 + }, + { + "__id__": 556 } ], "_prefab": { - "__id__": 552 + "__id__": 558 }, "_lpos": { "__type__": "cc.Vec3", @@ -11275,16 +11378,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 551 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 230 + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11303,11 +11406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 553 }, "_type": 0, "_inverted": false, @@ -11325,11 +11428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 555 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11371,11 +11474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 543 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 557 }, "_alignFlags": 45, "_target": null, @@ -11418,17 +11521,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 554 + "__id__": 560 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 553 + "__id__": 559 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11436,7 +11539,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 555 + "__id__": 561 }, "targetOverrides": null }, @@ -11450,16 +11553,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 556 + "__id__": 562 }, { - "__id__": 558 + "__id__": 564 }, { - "__id__": 559 + "__id__": 565 }, { - "__id__": 560 + "__id__": 566 } ], "removedComponents": [] @@ -11467,7 +11570,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 563 }, "propertyPath": [ "_name" @@ -11483,7 +11586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 563 }, "propertyPath": [ "_lpos" @@ -11498,7 +11601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 563 }, "propertyPath": [ "_lrot" @@ -11514,7 +11617,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 563 }, "propertyPath": [ "_euler" @@ -11530,17 +11633,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 562 + "__id__": 568 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 561 + "__id__": 567 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11548,7 +11651,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 563 + "__id__": 569 }, "targetOverrides": null }, @@ -11562,16 +11665,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 564 + "__id__": 570 }, { - "__id__": 566 + "__id__": 572 }, { - "__id__": 567 + "__id__": 573 }, { - "__id__": 568 + "__id__": 574 } ], "removedComponents": [] @@ -11579,7 +11682,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 571 }, "propertyPath": [ "_name" @@ -11595,7 +11698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 571 }, "propertyPath": [ "_lpos" @@ -11610,7 +11713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 571 }, "propertyPath": [ "_lrot" @@ -11626,7 +11729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 571 }, "propertyPath": [ "_euler" @@ -11642,17 +11745,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 570 + "__id__": 576 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 569 + "__id__": 575 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11660,7 +11763,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 571 + "__id__": 577 }, "targetOverrides": null }, @@ -11674,16 +11777,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 572 + "__id__": 578 }, { - "__id__": 574 + "__id__": 580 }, { - "__id__": 575 + "__id__": 581 }, { - "__id__": 576 + "__id__": 582 } ], "removedComponents": [] @@ -11691,7 +11794,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 579 }, "propertyPath": [ "_name" @@ -11707,7 +11810,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 579 }, "propertyPath": [ "_lpos" @@ -11722,7 +11825,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 579 }, "propertyPath": [ "_lrot" @@ -11738,7 +11841,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 579 }, "propertyPath": [ "_euler" @@ -11754,17 +11857,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 578 + "__id__": 584 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 577 + "__id__": 583 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11772,7 +11875,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 579 + "__id__": 585 }, "targetOverrides": null }, @@ -11786,16 +11889,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 580 + "__id__": 586 }, { - "__id__": 582 + "__id__": 588 }, { - "__id__": 583 + "__id__": 589 }, { - "__id__": 584 + "__id__": 590 } ], "removedComponents": [] @@ -11803,7 +11906,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 581 + "__id__": 587 }, "propertyPath": [ "_name" @@ -11819,7 +11922,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 581 + "__id__": 587 }, "propertyPath": [ "_lpos" @@ -11834,7 +11937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 581 + "__id__": 587 }, "propertyPath": [ "_lrot" @@ -11850,7 +11953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 581 + "__id__": 587 }, "propertyPath": [ "_euler" @@ -11866,17 +11969,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 586 + "__id__": 592 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 585 + "__id__": 591 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11884,7 +11987,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 587 + "__id__": 593 }, "targetOverrides": null }, @@ -11898,16 +12001,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 588 + "__id__": 594 }, { - "__id__": 590 + "__id__": 596 }, { - "__id__": 591 + "__id__": 597 }, { - "__id__": 592 + "__id__": 598 } ], "removedComponents": [] @@ -11915,7 +12018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 595 }, "propertyPath": [ "_name" @@ -11931,7 +12034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 595 }, "propertyPath": [ "_lpos" @@ -11946,7 +12049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 595 }, "propertyPath": [ "_lrot" @@ -11962,7 +12065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 595 }, "propertyPath": [ "_euler" @@ -11978,17 +12081,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 542 + "__id__": 548 }, "_prefab": { - "__id__": 594 + "__id__": 600 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 593 + "__id__": 599 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11996,7 +12099,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 595 + "__id__": 601 }, "targetOverrides": null }, @@ -12010,16 +12113,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 596 + "__id__": 602 }, { - "__id__": 598 + "__id__": 604 }, { - "__id__": 599 + "__id__": 605 }, { - "__id__": 600 + "__id__": 606 } ], "removedComponents": [] @@ -12027,7 +12130,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 603 }, "propertyPath": [ "_name" @@ -12043,7 +12146,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 603 }, "propertyPath": [ "_lpos" @@ -12058,7 +12161,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 603 }, "propertyPath": [ "_lrot" @@ -12074,7 +12177,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 603 }, "propertyPath": [ "_euler" @@ -12092,16 +12195,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 608 }, "_contentSize": { "__type__": "cc.Size", "width": 2200, - "height": 230 + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12120,11 +12223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 610 }, "_alignFlags": 13, "_target": null, @@ -12156,11 +12259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 612 }, "_resizeMode": 0, "_layoutType": 1, @@ -12220,16 +12323,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 616 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 230 + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12248,11 +12351,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": false, "__prefab": { - "__id__": 612 + "__id__": 618 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12293,11 +12396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 620 }, "_alignFlags": 45, "_target": null, @@ -12342,16 +12445,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 617 + "__id__": 623 }, "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 230 + "height": 180 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12370,18 +12473,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 625 }, "_alignFlags": 44, "_target": null, "_left": 0, "_right": 0, "_top": 942.384, - "_bottom": 107.61600000000004, + "_bottom": 111.918, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -12425,17 +12528,17 @@ "_active": false, "_components": [ { - "__id__": 622 + "__id__": 628 }, { - "__id__": 624 + "__id__": 630 }, { - "__id__": 626 + "__id__": 632 } ], "_prefab": { - "__id__": 628 + "__id__": 634 }, "_lpos": { "__type__": "cc.Vec3", @@ -12472,11 +12575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 623 + "__id__": 629 }, "_contentSize": { "__type__": "cc.Size", @@ -12500,11 +12603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 625 + "__id__": 631 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12545,11 +12648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 627 + "__id__": 633 }, "_alignFlags": 12, "_target": null, @@ -12598,7 +12701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -12626,7 +12729,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 632 + "__id__": 638 }, "_alignFlags": 45, "_target": null, @@ -12662,34 +12765,34 @@ }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 640 }, "hero_icon": { "__id__": 90 }, "ap_node": { - "__id__": 260 + "__id__": 262 }, "def_node": { - "__id__": 344 + "__id__": 346 }, "hp_node": { - "__id__": 302 + "__id__": 304 }, "cd_node": { - "__id__": 218 + "__id__": 220 }, "BG_node": { "__id__": 2 }, "info_node": { - "__id__": 379 + "__id__": 381 }, "name_node": { "__id__": 114 }, "cards_node": { - "__id__": 542 + "__id__": 548 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12702,13 +12805,13 @@ "__id__": 131 }, "upgrade_btn": { - "__id__": 392 + "__id__": 394 }, "fragment_node": { - "__id__": 437 + "__id__": 439 }, "chip_node": { - "__id__": 397 + "__id__": 399 }, "_id": "" }, @@ -12716,6 +12819,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "0cgq9nryVL14LCKRXmZr4X" }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 642 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9ei74ZpBNEgpBv/xWDg2LG" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -12728,33 +12849,33 @@ "instance": null, "targetOverrides": [ { - "__id__": 636 + "__id__": 644 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 593 + "__id__": 599 }, { - "__id__": 585 + "__id__": 591 }, { - "__id__": 577 + "__id__": 583 }, { - "__id__": 569 + "__id__": 575 }, { - "__id__": 561 + "__id__": 567 }, { - "__id__": 553 + "__id__": 559 }, { - "__id__": 392 + "__id__": 394 }, { - "__id__": 397 + "__id__": 399 }, { "__id__": 97 @@ -12779,17 +12900,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 633 + "__id__": 639 }, "sourceInfo": null, "propertyPath": [ "fragment_node" ], "target": { - "__id__": 392 + "__id__": 394 }, "targetInfo": { - "__id__": 637 + "__id__": 645 } }, { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 5ce5dfe6..4968933c 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -3795,9 +3795,13 @@ "home_btn": { "__id__": 181 }, - "hero_btn": null, + "hero_btn": { + "__id__": 141 + }, "rank_btn": null, - "tals_btn": null, + "tals_btn": { + "__id__": 212 + }, "heros_page": { "__id__": 88 }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index b6be8870..06cc5af0 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -110,7 +110,17 @@ export class SingletonModuleComp extends ecs.Comp { shop: false, // 购买药品面板按钮 }, /** 英雄局外成长数据:记录每个英雄的局外等级与碎片数量 */ - hero_growth: {} as Record, + // TODO: 以下为测试英雄升级功能的模拟数据,验证通过后需移除(避免污染云端存档) + hero_growth: { + // 碎片充足:可连升 2 级(10+20=30,剩余 20 不够升 4 级) + 5001: { uuid: 5001, lv: 1, fragments: 50 }, + // 碎片不足:升 4 级需 40,验证升级失败路径 + 5002: { uuid: 5002, lv: 3, fragments: 15 }, + // 碎片刚好够升到满级:升 6 级需 160 + 5003: { uuid: 5003, lv: 5, fragments: 160 }, + // 已满级:验证满级后 upgradeHero 返回 false + 5004: { uuid: 5004, lv: 6, fragments: 999 }, + } as Record, } vmdata: any = {