From 861ed2697779c4d9ed4c1403636f5f2f1f7e846f Mon Sep 17 00:00:00 2001 From: panw Date: Thu, 28 May 2026 09:08:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(map):=20=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=8D=A1=E6=B1=A0=E7=AD=89=E7=BA=A7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=B9=B6=E9=87=8D=E6=9E=84=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 删除HInfoComp和CardLiteComp中不再使用的pool_lv相关节点字段 2. 将卡池等级背景色显示逻辑迁移到HerosListComp中统一处理 3. 简化CardLiteComp的节点初始化隐藏逻辑 --- assets/resources/gui/element/heros.prefab | 2972 +++++++++------------ assets/script/game/map/CardLiteComp.ts | 22 +- assets/script/game/map/HInfoComp.ts | 19 +- assets/script/game/map/HerosListComp.ts | 26 + 4 files changed, 1339 insertions(+), 1700 deletions(-) diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 6b7e552a..834bb4fe 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,23 +25,23 @@ "__id__": 12 }, { - "__id__": 295 + "__id__": 316 } ], "_active": true, "_components": [ { - "__id__": 345 + "__id__": 366 }, { - "__id__": 347 + "__id__": 368 }, { - "__id__": 349 + "__id__": 370 } ], "_prefab": { - "__id__": 351 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -287,23 +287,23 @@ "__id__": 21 }, { - "__id__": 164 + "__id__": 185 }, { - "__id__": 268 + "__id__": 289 } ], "_active": true, "_components": [ { - "__id__": 290 + "__id__": 311 }, { - "__id__": 292 + "__id__": 313 } ], "_prefab": { - "__id__": 294 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -522,26 +522,26 @@ "__id__": 22 }, { - "__id__": 94 + "__id__": 115 }, { - "__id__": 116 + "__id__": 137 }, { - "__id__": 124 + "__id__": 145 }, { - "__id__": 130 + "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 161 + "__id__": 182 } ], "_prefab": { - "__id__": 163 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -585,29 +585,29 @@ "__id__": 23 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 55 - }, - { - "__id__": 71 - } - ], - "_active": true, - "_components": [ - { - "__id__": 87 + "__id__": 70 }, { "__id__": 89 + } + ], + "_active": true, + "_components": [ + { + "__id__": 108 }, { - "__id__": 91 + "__id__": 110 + }, + { + "__id__": 112 } ], "_prefab": { - "__id__": 93 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -640,426 +640,66 @@ }, { "__type__": "cc.Node", - "_name": "Card", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 22 }, - "_children": [ - { - "__id__": 24 - } - ], - "_active": true, - "_components": [ - { - "__id__": 32 - }, - { - "__id__": 34 - }, - { - "__id__": 36 - } - ], "_prefab": { - "__id__": 38 + "__id__": 24 }, - "_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": "" + "__editorExtras__": {} }, { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { + "__type__": "cc.PrefabInfo", + "root": { "__id__": 23 }, - "_children": [], - "_active": true, - "_components": [ + "asset": { + "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "5ep7uhpAlKzpglXeTBjRv2", + "instance": { + "__id__": 25 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "b0cjPYlipKaLdoCY0S1PUu", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { - "__id__": 25 + "__id__": 26 }, { - "__id__": 27 + "__id__": 28 }, { "__id__": 29 - } - ], - "_prefab": { - "__id__": 31 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 15, - "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__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 26 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 140, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c4Zkfa3w9J8IUYZ2GwqF1w" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 28 - }, - "_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@49830", - "__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": "f0ErbqNOpBaJjerTngjrKB" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_alignFlags": 41, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 7, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 200, - "_originalHeight": 216, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ecAmFx15GrLEohP1y4pNg" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "74UilvS61LG7OLaf5IUEeB", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 33 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 170, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "7ctY64epBJDLLIS/KYLue6" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 35 - }, - "_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@c77a7", - "__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": "f36/vqWY1CiZraZp2CF3vQ" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 37 - }, - "_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": 228, - "_originalHeight": 293, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a4bmFdJ/9Nk5SiLHjS6f0q" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c96kb6915FbI+mIS1xEUIZ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Hero", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 22 - }, - "_children": [ - { - "__id__": 40 - } - ], - "_active": true, - "_components": [ - { - "__id__": 48 }, { - "__id__": 50 + "__id__": 30 }, { - "__id__": 52 - } - ], - "_prefab": { - "__id__": 54 - }, - "_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.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 39 - }, - "_children": [], - "_active": true, - "_components": [ + "__id__": 31 + }, + { + "__id__": 33 + }, + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, { "__id__": 41 }, @@ -1068,665 +708,567 @@ }, { "__id__": 45 + }, + { + "__id__": 47 + }, + { + "__id__": 49 } ], - "_prefab": { - "__id__": 47 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "Hero" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5ep7uhpAlKzpglXeTBjRv2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 32 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13j2oupQRMUoUyChWYn2yc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 34 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 400 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 388 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 40 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 15, "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__": 40 - }, - "_enabled": true, - "__prefab": { + "__type__": "cc.TargetInfo", + "localID": [ + "69ZX4yvCZL67xK4+SdFMO0" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { "__id__": 42 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 140, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" + "propertyPath": [ + "_active" + ], + "value": true }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "871mZiM7xBjLWcJsXA0YDA" + "__type__": "cc.TargetInfo", + "localID": [ + "4aTybcwdBL1IFgubnxRuUh" + ] }, { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 40 - }, - "_enabled": true, - "__prefab": { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { "__id__": 44 }, - "_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@0ecfe", - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2cf9U2ltK0LlGuG4MGyzs" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 40 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "_alignFlags": 41, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 7, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 200, - "_originalHeight": 216, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e4UzKX6PZCTLZ0sXqzUVZj" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d1o23QLP9N+4u4IcTaixny", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 39 - }, - "_enabled": true, - "__prefab": { - "__id__": 49 - }, - "_contentSize": { + "propertyPath": [ + "_contentSize" + ], + "value": { "__type__": "cc.Size", "width": 170, "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "8brF1engtCyLlec4D4gRbq" + "__type__": "cc.TargetInfo", + "localID": [ + "eedc9qvxRPQpepecxrSorR" + ] }, { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 39 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 46 }, - "_enabled": true, - "__prefab": { - "__id__": 51 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 400 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "deY6hTveBKBIzSn0k9oD+7" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 48 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 388 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b7HYchf9tMK7WtemLDPjlE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 50 }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@f8fdb", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" + "y": 15, + "z": 0 + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "45obcJXS1DCIQ7/TPVQ1tj" + "__type__": "cc.TargetInfo", + "localID": [ + "93O2t0s3dBQYpkATdTKBPZ" + ] }, { - "__type__": "cc.Widget", - "_name": "", + "__type__": "cc.Node", "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 39 + "_parent": { + "__id__": 22 }, - "_enabled": true, - "__prefab": { - "__id__": 53 + "_prefab": { + "__id__": 52 }, - "_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": 228, - "_originalHeight": 293, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "04Cin2CgdDO4eXRG8rGEZP" + "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1 + "__id__": 51 }, "asset": { - "__id__": 0 + "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", + "__expectedType__": "cc.Prefab" }, - "fileId": "17CdW5SUtCAptMUkpmepLr", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "fileId": "5ep7uhpAlKzpglXeTBjRv2", + "instance": { + "__id__": 53 + }, + "targetOverrides": null }, { - "__type__": "cc.Node", - "_name": "Skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 22 + "__type__": "cc.PrefabInstance", + "fileId": "47a7oh6LNA36CyiipcPzSR", + "prefabRootNode": { + "__id__": 1 }, - "_children": [ + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 54 + }, { "__id__": 56 - } - ], - "_active": false, - "_components": [ - { - "__id__": 64 }, - { - "__id__": 66 - }, - { - "__id__": 68 - } - ], - "_prefab": { - "__id__": 70 - }, - "_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.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 55 - }, - "_children": [], - "_active": true, - "_components": [ { "__id__": 57 }, + { + "__id__": 58 + }, { "__id__": 59 }, { "__id__": 61 + }, + { + "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 + }, + { + "__id__": 69 } ], - "_prefab": { - "__id__": 63 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "Card" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5ep7uhpAlKzpglXeTBjRv2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, - "y": 30, + "y": 0, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 - }, - "_id": "" + } }, { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": { - "__id__": 58 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 140, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b3LMGNVnBH5bklDy1Kgs2t" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { "__id__": 60 }, - "_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@e1707", - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d1pMXDJYVMk6r3NzwhlL3b" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": { - "__id__": 62 - }, - "_alignFlags": 41, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 7, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 200, - "_originalHeight": 216, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3fTTjvsaRE8YbEu6JGNVh7" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "aasDc1ayRJOpSWIVOeLcnk", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 55 - }, - "_enabled": true, - "__prefab": { - "__id__": 65 - }, - "_contentSize": { + "propertyPath": [ + "_contentSize" + ], + "value": { "__type__": "cc.Size", "width": 170, - "height": 230 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" + "height": 200 + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7YaM+tgZHALhXeoXX8Exr" + "__type__": "cc.TargetInfo", + "localID": [ + "13j2oupQRMUoUyChWYn2yc" + ] }, { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 55 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 62 }, - "_enabled": true, - "__prefab": { - "__id__": 67 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 400 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 66 }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@0d310", - "__expectedType__": "cc.SpriteFrame" + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 388 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" + "y": 15, + "z": 0 + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "12nj9BY+RLYZo/1AOQQ8Tf" + "__type__": "cc.TargetInfo", + "localID": [ + "69ZX4yvCZL67xK4+SdFMO0" + ] }, { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { "__id__": 55 }, - "_enabled": true, - "__prefab": { - "__id__": 69 - }, - "_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": 228, - "_originalHeight": 293, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bfeU+pr5MoLatpZ9NLrNJ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "77zBplas5Elrqufu6XtXyk", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "propertyPath": [ + "_active" + ], + "value": false }, { "__type__": "cc.Node", - "_name": "Potion", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 22 }, - "_children": [ + "_prefab": { + "__id__": 71 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 70 + }, + "asset": { + "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "5ep7uhpAlKzpglXeTBjRv2", + "instance": { + "__id__": 72 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "58LZ2VEqZNRJignGGGK4/4", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { - "__id__": 72 - } - ], - "_active": false, - "_components": [ + "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 76 + }, + { + "__id__": 77 + }, + { + "__id__": 78 + }, { "__id__": 80 }, @@ -1735,342 +1277,429 @@ }, { "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 } ], - "_prefab": { - "__id__": 86 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "Skill" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5ep7uhpAlKzpglXeTBjRv2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 79 }, - "_id": "" + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13j2oupQRMUoUyChWYn2yc" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 81 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 83 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 400 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 85 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 388 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 15, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "69ZX4yvCZL67xK4+SdFMO0" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_active" + ], + "value": false }, { "__type__": "cc.Node", - "_name": "bg", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 22 }, - "_children": [], - "_active": true, - "_components": [ + "_prefab": { + "__id__": 90 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 89 + }, + "asset": { + "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", + "__expectedType__": "cc.Prefab" + }, + "fileId": "5ep7uhpAlKzpglXeTBjRv2", + "instance": { + "__id__": 91 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "8dC9bllE9JDZQNezp41C3w", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { - "__id__": 73 + "__id__": 92 }, { - "__id__": 75 + "__id__": 94 }, { - "__id__": 77 + "__id__": 95 + }, + { + "__id__": 96 + }, + { + "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + }, + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 } ], - "_prefab": { - "__id__": 79 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "Potion" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5ep7uhpAlKzpglXeTBjRv2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", "x": 0, - "y": 30, + "y": 0, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 - }, - "_id": "" + } }, { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 72 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 98 }, - "_enabled": true, - "__prefab": { - "__id__": 74 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 140, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3dE7B+3BlEJ4osdHjNC1vj" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 72 - }, - "_enabled": true, - "__prefab": { - "__id__": 76 - }, - "_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@78ee3", - "__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__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c7EZIUzcdK2rLNOEL9P5lf" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 72 - }, - "_enabled": true, - "__prefab": { - "__id__": 78 - }, - "_alignFlags": 41, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 7, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 200, - "_originalHeight": 216, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "66Q5KMR71HdKcsV2E833oZ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f59Tqs+uVNa6oFBkGM29nn", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 - }, - "_enabled": true, - "__prefab": { - "__id__": 81 - }, - "_contentSize": { + "propertyPath": [ + "_contentSize" + ], + "value": { "__type__": "cc.Size", "width": 170, - "height": 230 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" + "height": 200 + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "d7DqJfv5lN7JVZi+B/zzlV" + "__type__": "cc.TargetInfo", + "localID": [ + "13j2oupQRMUoUyChWYn2yc" + ] }, { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 }, - "_enabled": true, - "__prefab": { - "__id__": 83 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8mzU+nw5GLJ4CZ7ZTe6eE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 102 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 400 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5eZRKQByFG0LW2QA/PUw2u" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@41c54", - "__expectedType__": "cc.SpriteFrame" + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 332, + "height": 388 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4buoN7nzRM9Kty43yoN7ul" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 106 }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" + "y": 15, + "z": 0 + } }, { - "__type__": "cc.CompPrefabInfo", - "fileId": "2a9yVHDFZE5KFK7Zt0JB3U" + "__type__": "cc.TargetInfo", + "localID": [ + "69ZX4yvCZL67xK4+SdFMO0" + ] }, { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 }, - "_enabled": true, - "__prefab": { - "__id__": 85 - }, - "_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": 228, - "_originalHeight": 293, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "03kT+knYhNNZEH/ECxEkL6" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9aTOkuxHFGrpO+xhsPkCMZ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "propertyPath": [ + "_active" + ], + "value": false }, { "__type__": "cc.UITransform", @@ -2082,7 +1711,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2098,7 +1727,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65XEbcdrtG1Z1v0gZaIr3U" + "fileId": "36i6Q6LL1DQJFr5cFmRF0I" }, { "__type__": "cc.Sprite", @@ -2110,7 +1739,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 90 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2146,7 +1775,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9MNckC5lC8b9eRHQxqYPe" + "fileId": "a1JoJ2VWNJfp4a2J0L5sM/" }, { "__type__": "cc.Widget", @@ -2158,7 +1787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 113 }, "_alignFlags": 45, "_target": null, @@ -2182,7 +1811,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6fFKBWRD9N+JT1TqkIQ3x+" + "fileId": "c0HZXJISxNfp99ff/N8edX" }, { "__type__": "cc.PrefabInfo", @@ -2192,7 +1821,7 @@ "asset": { "__id__": 0 }, - "fileId": "0bCPhP38ZEFqbEqIbNxYv2", + "fileId": "21lgquLoND6INhJWcuCjht", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2207,29 +1836,29 @@ }, "_children": [ { - "__id__": 95 + "__id__": 116 }, { - "__id__": 101 + "__id__": 122 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 128 }, { - "__id__": 109 + "__id__": 130 }, { - "__id__": 111 + "__id__": 132 }, { - "__id__": 113 + "__id__": 134 } ], "_prefab": { - "__id__": 115 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2266,20 +1895,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 94 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 117 }, { - "__id__": 98 + "__id__": 119 } ], "_prefab": { - "__id__": 100 + "__id__": 121 }, "_lpos": { "__type__": "cc.Vec3", @@ -2316,11 +1945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -2344,11 +1973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 120 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2405,20 +2034,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 94 + "__id__": 115 }, "_children": [], "_active": false, "_components": [ { - "__id__": 102 + "__id__": 123 }, { - "__id__": 104 + "__id__": 125 } ], "_prefab": { - "__id__": 106 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -2455,11 +2084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 124 }, "_contentSize": { "__type__": "cc.Size", @@ -2483,11 +2112,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 122 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2544,11 +2173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 129 }, "_contentSize": { "__type__": "cc.Size", @@ -2572,11 +2201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 131 }, "_type": 3, "_inverted": false, @@ -2594,11 +2223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 133 }, "_alignFlags": 41, "_target": null, @@ -2630,11 +2259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2697,17 +2326,17 @@ "_active": true, "_components": [ { - "__id__": 117 + "__id__": 138 }, { - "__id__": 119 + "__id__": 140 }, { - "__id__": 121 + "__id__": 142 } ], "_prefab": { - "__id__": 123 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -2744,11 +2373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -2772,11 +2401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2840,11 +2469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 143 }, "_alignFlags": 17, "_target": null, @@ -2895,14 +2524,14 @@ "_active": true, "_components": [ { - "__id__": 125 + "__id__": 146 }, { - "__id__": 127 + "__id__": 148 } ], "_prefab": { - "__id__": 129 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -2939,11 +2568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -2967,11 +2596,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3049,14 +2678,14 @@ "__id__": 21 }, "_prefab": { - "__id__": 131 + "__id__": 152 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 130 + "__id__": 151 }, "asset": { "__uuid__": "bf40528a-fcf8-44da-af2e-d6b113904f35", @@ -3064,7 +2693,7 @@ }, "fileId": "0exfRYL89I3Lnv8hzgx3e7", "instance": { - "__id__": 132 + "__id__": 153 }, "targetOverrides": null }, @@ -3077,51 +2706,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 133 - }, - { - "__id__": 135 - }, - { - "__id__": 136 - }, - { - "__id__": 137 - }, - { - "__id__": 138 - }, - { - "__id__": 140 - }, - { - "__id__": 142 - }, - { - "__id__": 144 - }, - { - "__id__": 146 - }, - { - "__id__": 148 - }, - { - "__id__": 150 - }, - { - "__id__": 152 - }, - { - "__id__": 153 - }, { "__id__": 154 }, - { - "__id__": 155 - }, { "__id__": 156 }, @@ -3133,6 +2720,48 @@ }, { "__id__": 159 + }, + { + "__id__": 161 + }, + { + "__id__": 163 + }, + { + "__id__": 165 + }, + { + "__id__": 167 + }, + { + "__id__": 169 + }, + { + "__id__": 171 + }, + { + "__id__": 173 + }, + { + "__id__": 174 + }, + { + "__id__": 175 + }, + { + "__id__": 176 + }, + { + "__id__": 177 + }, + { + "__id__": 178 + }, + { + "__id__": 179 + }, + { + "__id__": 180 } ], "removedComponents": [] @@ -3140,7 +2769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 155 }, "propertyPath": [ "_name" @@ -3156,7 +2785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 155 }, "propertyPath": [ "_lpos" @@ -3171,7 +2800,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 155 }, "propertyPath": [ "_lrot" @@ -3187,7 +2816,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 155 }, "propertyPath": [ "_euler" @@ -3202,7 +2831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 160 }, "propertyPath": [ "_active" @@ -3218,7 +2847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 162 }, "propertyPath": [ "_active" @@ -3234,7 +2863,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 164 }, "propertyPath": [ "_active" @@ -3250,7 +2879,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 + "__id__": 166 }, "propertyPath": [ "_active" @@ -3266,7 +2895,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 168 }, "propertyPath": [ "_active" @@ -3282,7 +2911,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 170 }, "propertyPath": [ "_active" @@ -3298,7 +2927,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 172 }, "propertyPath": [ "_top" @@ -3314,7 +2943,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 170 }, "propertyPath": [ "_lpos" @@ -3329,7 +2958,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 168 }, "propertyPath": [ "_lpos" @@ -3344,7 +2973,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 + "__id__": 166 }, "propertyPath": [ "_lpos" @@ -3359,7 +2988,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 164 }, "propertyPath": [ "_lpos" @@ -3374,7 +3003,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 162 }, "propertyPath": [ "_lpos" @@ -3389,7 +3018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 160 }, "propertyPath": [ "_lpos" @@ -3404,7 +3033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 172 }, "propertyPath": [ "_left" @@ -3414,7 +3043,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 181 }, "propertyPath": [ "_active" @@ -3437,7 +3066,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -3478,29 +3107,29 @@ }, "_children": [ { - "__id__": 165 + "__id__": 186 }, { - "__id__": 193 + "__id__": 214 }, { - "__id__": 227 + "__id__": 248 } ], "_active": true, "_components": [ { - "__id__": 261 + "__id__": 282 }, { - "__id__": 263 + "__id__": 284 }, { - "__id__": 265 + "__id__": 286 } ], "_prefab": { - "__id__": 267 + "__id__": 288 }, "_lpos": { "__type__": "cc.Vec3", @@ -3537,33 +3166,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 185 }, "_children": [ { - "__id__": 166 + "__id__": 187 }, { - "__id__": 174 + "__id__": 195 }, { - "__id__": 180 + "__id__": 201 } ], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 207 }, { - "__id__": 188 + "__id__": 209 }, { - "__id__": 190 + "__id__": 211 } ], "_prefab": { - "__id__": 192 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -3600,23 +3229,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 188 }, { - "__id__": 169 + "__id__": 190 }, { - "__id__": 171 + "__id__": 192 } ], "_prefab": { - "__id__": 173 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -3653,11 +3282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -3681,11 +3310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3729,11 +3358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 193 }, "_alignFlags": 45, "_target": null, @@ -3778,20 +3407,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 196 }, { - "__id__": 177 + "__id__": 198 } ], "_prefab": { - "__id__": 179 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -3828,11 +3457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -3856,11 +3485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3917,20 +3546,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 186 }, "_children": [], "_active": true, "_components": [ { - "__id__": 181 + "__id__": 202 }, { - "__id__": 183 + "__id__": 204 } ], "_prefab": { - "__id__": 185 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -3967,11 +3596,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -3995,11 +3624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 180 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4076,11 +3705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 186 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -4104,11 +3733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 186 }, "_enabled": false, "__prefab": { - "__id__": 189 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4149,11 +3778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 186 }, "_enabled": false, "__prefab": { - "__id__": 191 + "__id__": 212 }, "_alignFlags": 44, "_target": null, @@ -4198,36 +3827,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 185 }, "_children": [ { - "__id__": 194 + "__id__": 215 }, { - "__id__": 202 + "__id__": 223 }, { - "__id__": 208 + "__id__": 229 }, { - "__id__": 214 + "__id__": 235 } ], "_active": true, "_components": [ { - "__id__": 220 + "__id__": 241 }, { - "__id__": 222 + "__id__": 243 }, { - "__id__": 224 + "__id__": 245 } ], "_prefab": { - "__id__": 226 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -4264,23 +3893,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 216 }, { - "__id__": 197 + "__id__": 218 }, { - "__id__": 199 + "__id__": 220 } ], "_prefab": { - "__id__": 201 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -4317,11 +3946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -4345,11 +3974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4393,11 +4022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 221 }, "_alignFlags": 45, "_target": null, @@ -4442,20 +4071,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 203 + "__id__": 224 }, { - "__id__": 205 + "__id__": 226 } ], "_prefab": { - "__id__": 207 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4492,11 +4121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4520,11 +4149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4581,20 +4210,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 209 + "__id__": 230 }, { - "__id__": 211 + "__id__": 232 } ], "_prefab": { - "__id__": 213 + "__id__": 234 }, "_lpos": { "__type__": "cc.Vec3", @@ -4631,11 +4260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -4659,11 +4288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4740,20 +4369,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 214 }, "_children": [], "_active": false, "_components": [ { - "__id__": 215 + "__id__": 236 }, { - "__id__": 217 + "__id__": 238 } ], "_prefab": { - "__id__": 219 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -4790,11 +4419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -4818,11 +4447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4899,11 +4528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -4927,11 +4556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 214 }, "_enabled": false, "__prefab": { - "__id__": 223 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4972,11 +4601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 214 }, "_enabled": false, "__prefab": { - "__id__": 225 + "__id__": 246 }, "_alignFlags": 44, "_target": null, @@ -5021,36 +4650,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 185 }, "_children": [ { - "__id__": 228 + "__id__": 249 }, { - "__id__": 236 + "__id__": 257 }, { - "__id__": 242 + "__id__": 263 }, { - "__id__": 248 + "__id__": 269 } ], "_active": true, "_components": [ { - "__id__": 254 + "__id__": 275 }, { - "__id__": 256 + "__id__": 277 }, { - "__id__": 258 + "__id__": 279 } ], "_prefab": { - "__id__": 260 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -5087,23 +4716,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 227 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 250 }, { - "__id__": 231 + "__id__": 252 }, { - "__id__": 233 + "__id__": 254 } ], "_prefab": { - "__id__": 235 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -5140,11 +4769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -5168,11 +4797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5216,11 +4845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 255 }, "_alignFlags": 45, "_target": null, @@ -5265,20 +4894,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 227 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 258 }, { - "__id__": 239 + "__id__": 260 } ], "_prefab": { - "__id__": 241 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -5315,11 +4944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -5343,11 +4972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5401,20 +5030,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 227 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 243 + "__id__": 264 }, { - "__id__": 245 + "__id__": 266 } ], "_prefab": { - "__id__": 247 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", @@ -5451,11 +5080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 265 }, "_contentSize": { "__type__": "cc.Size", @@ -5479,11 +5108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 267 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5560,20 +5189,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 227 + "__id__": 248 }, "_children": [], "_active": false, "_components": [ { - "__id__": 249 + "__id__": 270 }, { - "__id__": 251 + "__id__": 272 } ], "_prefab": { - "__id__": 253 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -5610,11 +5239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -5638,11 +5267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5719,11 +5348,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -5747,11 +5376,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 248 }, "_enabled": false, "__prefab": { - "__id__": 257 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5792,11 +5421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 248 }, "_enabled": false, "__prefab": { - "__id__": 259 + "__id__": 280 }, "_alignFlags": 44, "_target": null, @@ -5841,11 +5470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -5869,11 +5498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 285 }, "_alignFlags": 0, "_target": null, @@ -5905,11 +5534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 287 }, "_resizeMode": 1, "_layoutType": 3, @@ -5960,26 +5589,26 @@ }, "_children": [ { - "__id__": 269 + "__id__": 290 }, { - "__id__": 277 + "__id__": 298 } ], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 304 }, { - "__id__": 285 + "__id__": 306 }, { - "__id__": 287 + "__id__": 308 } ], "_prefab": { - "__id__": 289 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -6016,23 +5645,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 289 }, "_children": [], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 291 }, { - "__id__": 272 + "__id__": 293 }, { - "__id__": 274 + "__id__": 295 } ], "_prefab": { - "__id__": 276 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -6069,11 +5698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 292 }, "_contentSize": { "__type__": "cc.Size", @@ -6097,11 +5726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 294 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6145,11 +5774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 296 }, "_alignFlags": 45, "_target": null, @@ -6194,20 +5823,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 289 }, "_children": [], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 299 }, { - "__id__": 280 + "__id__": 301 } ], "_prefab": { - "__id__": 282 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", @@ -6244,11 +5873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 300 }, "_contentSize": { "__type__": "cc.Size", @@ -6272,11 +5901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 302 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6353,11 +5982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 305 }, "_contentSize": { "__type__": "cc.Size", @@ -6381,11 +6010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 307 }, "_alignFlags": 0, "_target": null, @@ -6417,11 +6046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 289 }, "_enabled": false, "__prefab": { - "__id__": 288 + "__id__": 309 }, "_resizeMode": 1, "_layoutType": 3, @@ -6472,7 +6101,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", @@ -6500,7 +6129,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 314 }, "_alignFlags": 41, "_target": null, @@ -6549,20 +6178,20 @@ }, "_children": [ { - "__id__": 296 + "__id__": 317 } ], "_active": true, "_components": [ { - "__id__": 340 + "__id__": 361 }, { - "__id__": 342 + "__id__": 363 } ], "_prefab": { - "__id__": 344 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -6599,33 +6228,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 295 + "__id__": 316 }, "_children": [ { - "__id__": 297 + "__id__": 318 }, { - "__id__": 315 + "__id__": 336 } ], "_active": true, "_components": [ + { + "__id__": 354 + }, + { + "__id__": 356 + }, { "__id__": 333 }, { - "__id__": 335 - }, - { - "__id__": 312 - }, - { - "__id__": 337 + "__id__": 358 } ], "_prefab": { - "__id__": 339 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -6662,30 +6291,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 296 + "__id__": 317 }, "_children": [ { - "__id__": 298 + "__id__": 319 } ], "_active": false, "_components": [ { - "__id__": 304 + "__id__": 325 }, { - "__id__": 306 + "__id__": 327 }, { - "__id__": 308 + "__id__": 329 }, { - "__id__": 310 + "__id__": 331 } ], "_prefab": { - "__id__": 332 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -6722,20 +6351,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 297 + "__id__": 318 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 320 }, { - "__id__": 301 + "__id__": 322 } ], "_prefab": { - "__id__": 303 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -6772,11 +6401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 321 }, "_contentSize": { "__type__": "cc.Size", @@ -6800,11 +6429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 323 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6858,11 +6487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -6886,11 +6515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6931,11 +6560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 330 }, "_alignFlags": 37, "_target": null, @@ -6967,17 +6596,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 318 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 332 }, "_scrollView": { - "__id__": 312 + "__id__": 333 }, "_handle": { - "__id__": 301 + "__id__": 322 }, "_direction": 1, "_enableAutoHide": false, @@ -6994,11 +6623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 334 }, "bounceDuration": 0.23, "brake": 0.75, @@ -7009,11 +6638,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 314 + "__id__": 335 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 310 + "__id__": 331 }, "_id": "" }, @@ -7027,23 +6656,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 315 + "__id__": 336 }, "_children": [], "_active": true, "_components": [ { - "__id__": 325 + "__id__": 346 }, { - "__id__": 327 + "__id__": 348 }, { - "__id__": 329 + "__id__": 350 } ], "_prefab": { - "__id__": 331 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -7080,30 +6709,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 296 + "__id__": 317 }, "_children": [ { - "__id__": 314 + "__id__": 335 } ], "_active": true, "_components": [ { - "__id__": 316 + "__id__": 337 }, { - "__id__": 318 + "__id__": 339 }, { - "__id__": 320 + "__id__": 341 }, { - "__id__": 322 + "__id__": 343 } ], "_prefab": { - "__id__": 324 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -7140,11 +6769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -7168,11 +6797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 340 }, "_type": 0, "_inverted": false, @@ -7190,11 +6819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 342 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7236,11 +6865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 344 }, "_alignFlags": 45, "_target": null, @@ -7285,11 +6914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -7313,11 +6942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 349 }, "_alignFlags": 41, "_target": null, @@ -7349,11 +6978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 351 }, "_resizeMode": 0, "_layoutType": 3, @@ -7413,11 +7042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -7441,11 +7070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 317 }, "_enabled": false, "__prefab": { - "__id__": 336 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7486,11 +7115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 359 }, "_alignFlags": 45, "_target": null, @@ -7535,11 +7164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7563,11 +7192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 364 }, "_alignFlags": 45, "_target": null, @@ -7616,7 +7245,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 367 }, "_contentSize": { "__type__": "cc.Size", @@ -7644,7 +7273,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 369 }, "_alignFlags": 45, "_target": null, @@ -7680,36 +7309,35 @@ }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 371 }, "hero_icon": { - "__id__": 95 - }, - "ap_node": { - "__id__": 193 - }, - "hp_node": { - "__id__": 227 - }, - "cd_node": { - "__id__": 165 - }, - "info_node": { - "__id__": 277 - }, - "name_node": { "__id__": 116 }, + "ap_node": { + "__id__": 214 + }, + "hp_node": { + "__id__": 248 + }, + "cd_node": { + "__id__": 186 + }, + "BG_node": null, + "info_node": { + "__id__": 298 + }, + "name_node": { + "__id__": 137 + }, "cards_node": { - "__id__": 314 + "__id__": 335 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", "__expectedType__": "cc.Prefab" }, - "lv_node": { - "__id__": 130 - }, + "lv_node": null, "type_node": null, "_id": "" }, @@ -7730,7 +7358,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 130 + "__id__": 151 + }, + { + "__id__": 89 + }, + { + "__id__": 70 + }, + { + "__id__": 51 + }, + { + "__id__": 23 } ] } diff --git a/assets/script/game/map/CardLiteComp.ts b/assets/script/game/map/CardLiteComp.ts index 50717215..f25bee19 100644 --- a/assets/script/game/map/CardLiteComp.ts +++ b/assets/script/game/map/CardLiteComp.ts @@ -53,8 +53,6 @@ export class CardLiteComp extends CCComp { Ckind_node: Node = null! @property(Node) BG_node: Node = null! - @property(Node) - pool_lv_node: Node = null! @property(Label) lvl_node: Label = null! @@ -211,10 +209,7 @@ export class CardLiteComp extends CCComp { hasIcon: !!this.icon_node, hasCost: !!this.cost_node, hasBG: !!this.BG_node, - hasPoolLv: !!this.pool_lv_node, hasLvl: !!this.lvl_node, - bgChildren: this.BG_node?.children.map(c => c.name) || [], - poolChildren: this.pool_lv_node?.children.map(c => c.name) || [], nodeActive: this.node.active, nodeScale: this.node.scale.toString(), nodePos: this.node.position.toString(), @@ -242,13 +237,6 @@ export class CardLiteComp extends CCComp { }); } - const cardLvStr = `lv${this.cardData.pool_lv}`; - if (this.pool_lv_node) { - this.pool_lv_node.children.forEach(child => { - child.active = (child.name === cardLvStr); - }); - } - if (this.card_type === CardType.Hero) { const hero = HeroInfo[this.card_uuid]; const heroLv = Math.max(1, this.cardData.hero_lv ?? hero?.lv ?? 1); @@ -317,10 +305,12 @@ export class CardLiteComp extends CCComp { } if (this.lvl_node) this.lvl_node.node.active = false; if (this.BG_node) { - this.BG_node.children.forEach(child => child.active = false); - } - if (this.pool_lv_node) { - this.pool_lv_node.children.forEach(child => child.active = false); + this.BG_node.children.forEach(child => { + child.active = false; + child.children.forEach(colorChild => { + colorChild.active = false; + }); + }); } if (this.icon_node) { (this.icon_node as Node).setScale(new Vec3(1, 1, 1)); diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index 6e019f0e..57873832 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -76,8 +76,6 @@ export class HInfoComp extends CCComp { @property(Label) lv_node: Label = null! - @property(Node) - pool_lvnode: Node = null! @property(Node) ap_node=null! @@ -160,13 +158,6 @@ export class HInfoComp extends CCComp { this.lv_node.color = getLvColor(heroLv); } - if (this.pool_lvnode) { - const poolLvStr = `lv${this.previewPoolLv}`; - this.pool_lvnode.children.forEach(child => { - child.active = (child.name === poolLvStr); - }); - } - const poolColorNames = ["green", "blue", "purple", "yellow", "red"]; const poolColorIdx = Math.min(this.previewPoolLv, 5) - 1; const activeColor = poolColorNames[poolColorIdx]; @@ -288,16 +279,8 @@ export class HInfoComp extends CCComp { } // ---- 卡池等级标识 ---- - const poolLv = this.model.pool_lv ?? 1; - if (this.pool_lvnode) { - const poolLvStr = `lv${poolLv}`; - this.pool_lvnode.children.forEach(child => { - child.active = (child.name === poolLvStr); - }); - } - const poolColorNames = ["green", "blue", "purple", "yellow", "red"]; - const poolColorIdx = Math.min(poolLv, 5) - 1; + const poolColorIdx = Math.min(this.model.pool_lv ?? 1, 5) - 1; const activeColor = poolColorNames[poolColorIdx]; const kindName = CKind[CKind.Hero]; if (this.BG_node) { diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index bf93bb63..64b88b9c 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -24,6 +24,7 @@ import { oops } from "db://oops-framework/core/Oops"; import { mLogger } from "../common/Logger"; import { HeroInfo, HeroList } from "../common/config/heroSet"; import { buildSkillDesc } from "../common/config/HeroSkillDesc"; +import { CKind } from "../common/config/CardSet"; import { CardLiteComp } from "./CardLiteComp"; const { property, ccclass } = _decorator; @@ -45,6 +46,10 @@ export class HerosListComp extends CCComp { @property(Node) cd_node = null! + /** 卡牌背景底框节点（按卡池等级切换子节点显示） */ + @property(Node) + BG_node=null! + @property(Node) info_node = null! @@ -199,11 +204,32 @@ export class HerosListComp extends CCComp { if (infoLabel) infoLabel.string = desc || hero.info || "" } + this.updatePoolLvBg(hero.pool_lv ?? 1) this.updateLvDisplay(hero) this.updateTypeDisplay(hero) this.updateHeroAnimation(uuid) } + private updatePoolLvBg(poolLv: number) { + if (!this.BG_node) return + const poolColorNames = ["green", "blue", "purple", "yellow", "red"]; + const poolColorIdx = Math.min(poolLv, 5) - 1; + const activeColor = poolColorNames[poolColorIdx]; + const kindName = CKind[CKind.Hero]; + this.BG_node.children.forEach(child => { + child.active = (child.name === kindName); + if (child.active) { + child.children.forEach(colorChild => { + colorChild.active = (colorChild.name === activeColor); + }); + } else { + child.children.forEach(colorChild => { + colorChild.active = false; + }); + } + }); + } + private updateCdDisplay(hero: typeof HeroInfo[number]) { if (!this.cd_node) return const skillKeys = Object.keys(hero.skills)