From e026ee0e3540e1bf73e655b5337a7d2ed28a3c06 Mon Sep 17 00:00:00 2001 From: pan Date: Fri, 31 Jul 2026 17:12:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ui):=20=E9=87=8D=E6=9E=84=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E5=92=8C=E8=8B=B1=E9=9B=84=E7=9A=84=E8=AF=8D=E6=9D=A1?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 替换单个Label词条为RichText多行展示 2. 统一使用buildEquipRich和buildSkillDescRich生成带高亮的词条文本 3. 调整prefab的UI元素尺寸适配新的富文本展示 4. 新增showName参数适配不同场景的技能名显示需求 --- assets/resources/gui/element/cEquip.prefab | 1146 +++++++------- assets/resources/gui/element/cHero.prefab | 1045 +++++++------ assets/resources/gui/element/cItem.prefab | 2 +- assets/resources/gui/element/cSkill.prefab | 2 +- assets/resources/gui/element/hnode.prefab | 1322 +++++++++-------- .../game/common/config/HeroSkillDesc.ts | 18 +- assets/script/game/map/CHeroComp.ts | 28 +- assets/script/game/map/EquipListComp.ts | 34 +- 8 files changed, 1981 insertions(+), 1616 deletions(-) diff --git a/assets/resources/gui/element/cEquip.prefab b/assets/resources/gui/element/cEquip.prefab index 5e98f6df..1ac22c96 100644 --- a/assets/resources/gui/element/cEquip.prefab +++ b/assets/resources/gui/element/cEquip.prefab @@ -32,22 +32,25 @@ }, { "__id__": 121 + }, + { + "__id__": 127 } ], "_active": true, "_components": [ { - "__id__": 154 + "__id__": 160 }, { - "__id__": 156 + "__id__": 162 }, { - "__id__": 158 + "__id__": 164 } ], "_prefab": { - "__id__": 364 + "__id__": 370 }, "_lpos": { "__type__": "cc.Vec3", @@ -1392,7 +1395,7 @@ "__id__": 106 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 114 @@ -2145,6 +2148,135 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "RichText", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 122 + }, + { + "__id__": 124 + } + ], + "_prefab": { + "__id__": 126 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -37.485, + "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__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 189.9, + "height": 26.46 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "238epjrvZHJqGFEbEZsS5L" + }, + { + "__type__": "cc.RichText", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 125 + }, + "_lineHeight": 21, + "_string": "RichText", + "_horizontalAlign": 0, + "_verticalAlign": 0, + "_fontSize": 20, + "_fontColor": { + "__type__": "cc.Color", + "r": 32, + "g": 32, + "b": 32, + "a": 255 + }, + "_maxWidth": 189.9, + "_fontFamily": "Arial", + "_font": null, + "_isSystemFontUsed": true, + "_userDefinedFont": null, + "_cacheMode": 0, + "_imageAtlas": null, + "_handleTouchEvent": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ef152rnJpP/56sxtRJdkoO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbwOy406ROmYOIsh0P4DR8", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -2152,14 +2284,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 122 + "__id__": 128 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 121 + "__id__": 127 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2167,7 +2299,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 123 + "__id__": 129 }, "targetOverrides": null }, @@ -2180,31 +2312,22 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 124 + "__id__": 130 } ], "propertyOverrides": [ { - "__id__": 128 + "__id__": 134 }, { - "__id__": 130 - }, - { - "__id__": 131 - }, - { - "__id__": 132 - }, - { - "__id__": 133 - }, - { - "__id__": 135 + "__id__": 136 }, { "__id__": 137 }, + { + "__id__": 138 + }, { "__id__": 139 }, @@ -2218,16 +2341,25 @@ "__id__": 145 }, { - "__id__": 146 + "__id__": 147 }, { - "__id__": 148 + "__id__": 149 }, { - "__id__": 150 + "__id__": 151 }, { "__id__": 152 + }, + { + "__id__": 154 + }, + { + "__id__": 156 + }, + { + "__id__": 158 } ], "removedComponents": [] @@ -2235,11 +2367,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 125 + "__id__": 131 }, "components": [ { - "__id__": 126 + "__id__": 132 } ] }, @@ -2255,15 +2387,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 121 + "__id__": 127 } }, "node": { - "__id__": 121 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 133 }, "_alignFlags": 4, "_target": null, @@ -2292,7 +2424,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 135 }, "propertyPath": [ "_name" @@ -2308,7 +2440,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 135 }, "propertyPath": [ "_lpos" @@ -2323,7 +2455,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 135 }, "propertyPath": [ "_lrot" @@ -2339,7 +2471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 129 + "__id__": 135 }, "propertyPath": [ "_euler" @@ -2354,7 +2486,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 140 }, "propertyPath": [ "_contentSize" @@ -2374,7 +2506,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 136 + "__id__": 142 }, "propertyPath": [ "_contentSize" @@ -2394,7 +2526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 138 + "__id__": 144 }, "propertyPath": [ "_contentSize" @@ -2414,7 +2546,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 }, "propertyPath": [ "_lpos" @@ -2435,7 +2567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_contentSize" @@ -2455,7 +2587,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 150 }, "propertyPath": [ "_top" @@ -2471,7 +2603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 150 }, "propertyPath": [ "_bottom" @@ -2481,7 +2613,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 153 }, "propertyPath": [ "_active" @@ -2497,7 +2629,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 155 }, "propertyPath": [ "_lpos" @@ -2518,7 +2650,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 157 }, "propertyPath": [ "_color" @@ -2540,7 +2672,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 153 + "__id__": 159 }, "propertyPath": [ "_color" @@ -2569,7 +2701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 161 }, "_contentSize": { "__type__": "cc.Size", @@ -2597,7 +2729,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 163 }, "_alignFlags": 40, "_target": null, @@ -2633,34 +2765,28 @@ }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 165 }, "icon_node": { - "__id__": 160 + "__id__": 166 }, "bg_node": { - "__id__": 200 + "__id__": 206 }, "name_label": { "__id__": 24 }, - "fied1": { - "__id__": 93 - }, - "fied2": { - "__id__": 101 - }, - "fied3": { - "__id__": 109 + "info_rich": { + "__id__": 124 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 121 + "__id__": 127 }, "cost_label": { - "__id__": 314 + "__id__": 320 }, "_id": "" }, @@ -2674,20 +2800,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 201 }, { - "__id__": 197 + "__id__": 203 } ], "_prefab": { - "__id__": 199 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -2727,39 +2853,39 @@ "__id__": 40 }, "_children": [ - { - "__id__": 162 - }, - { - "__id__": 160 - }, { "__id__": 168 }, + { + "__id__": 166 + }, { "__id__": 174 }, { "__id__": 180 + }, + { + "__id__": 186 } ], "_active": true, "_components": [ - { - "__id__": 186 - }, - { - "__id__": 188 - }, - { - "__id__": 190 - }, { "__id__": 192 + }, + { + "__id__": 194 + }, + { + "__id__": 196 + }, + { + "__id__": 198 } ], "_prefab": { - "__id__": 194 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -2796,20 +2922,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 163 + "__id__": 169 }, { - "__id__": 165 + "__id__": 171 } ], "_prefab": { - "__id__": 167 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", @@ -2846,11 +2972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -2874,11 +3000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2932,143 +3058,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 169 - }, - { - "__id__": 171 - } - ], - "_prefab": { - "__id__": 173 - }, - "_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": 0.9, - "y": 0.9, - "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__": 168 - }, - "_enabled": true, - "__prefab": { - "__id__": 170 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 78, - "height": 78 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "acwGVgSsdCUIEmlLZVMZbN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 168 - }, - "_enabled": true, - "__prefab": { - "__id__": 172 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8dbZob0aNPQJ3mFkIF47XB" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "146QBwBOlH6LhCFATSJzVj", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "equip", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 161 + "__id__": 167 }, "_children": [], "_active": false, @@ -3138,7 +3128,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23LtSLPpxPLbmAJs09fdIw" + "fileId": "acwGVgSsdCUIEmlLZVMZbN" }, { "__type__": "cc.Sprite", @@ -3183,7 +3173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dzgwgV3tNZJEoewp8KY38" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -3193,18 +3183,18 @@ "asset": { "__id__": 0 }, - "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "fileId": "146QBwBOlH6LhCFATSJzVj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "item", + "_name": "equip", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 161 + "__id__": 167 }, "_children": [], "_active": false, @@ -3274,7 +3264,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8GRaxM2BNv76iifo8Ck5A" + "fileId": "23LtSLPpxPLbmAJs09fdIw" }, { "__type__": "cc.Sprite", @@ -3317,6 +3307,142 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dzgwgV3tNZJEoewp8KY38" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 167 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 187 + }, + { + "__id__": 189 + } + ], + "_prefab": { + "__id__": 191 + }, + "_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": 0.9, + "y": 0.9, + "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__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 188 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8GRaxM2BNv76iifo8Ck5A" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, { "__type__": "cc.CompPrefabInfo", "fileId": "13FTxdrcpMHrkutB9UhlCj" @@ -3340,11 +3466,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -3368,11 +3494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 195 }, "_type": 0, "_inverted": false, @@ -3390,11 +3516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 197 }, "_alignFlags": 45, "_target": null, @@ -3426,11 +3552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 161 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3485,11 +3611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 202 }, "_contentSize": { "__type__": "cc.Size", @@ -3513,11 +3639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 204 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3575,35 +3701,35 @@ }, "_children": [ { - "__id__": 201 + "__id__": 207 }, { - "__id__": 217 + "__id__": 223 }, { - "__id__": 233 + "__id__": 239 }, { - "__id__": 249 + "__id__": 255 }, { - "__id__": 265 + "__id__": 271 }, { - "__id__": 281 + "__id__": 287 } ], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 315 }, { - "__id__": 311 + "__id__": 317 } ], "_prefab": { - "__id__": 313 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -3640,27 +3766,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 202 + "__id__": 208 } ], "_active": false, "_components": [ { - "__id__": 210 + "__id__": 216 }, { - "__id__": 212 + "__id__": 218 }, { - "__id__": 214 + "__id__": 220 } ], "_prefab": { - "__id__": 216 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -3697,23 +3823,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 203 + "__id__": 209 }, { - "__id__": 205 + "__id__": 211 }, { - "__id__": 207 + "__id__": 213 } ], "_prefab": { - "__id__": 209 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", @@ -3750,11 +3876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 210 }, "_contentSize": { "__type__": "cc.Size", @@ -3778,11 +3904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3826,11 +3952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 214 }, "_alignFlags": 45, "_target": null, @@ -3875,11 +4001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -3903,11 +4029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3951,11 +4077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 221 }, "_alignFlags": 45, "_target": null, @@ -4000,27 +4126,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 218 + "__id__": 224 } ], "_active": false, "_components": [ { - "__id__": 226 + "__id__": 232 }, { - "__id__": 228 + "__id__": 234 }, { - "__id__": 230 + "__id__": 236 } ], "_prefab": { - "__id__": 232 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -4057,23 +4183,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 225 }, { - "__id__": 221 + "__id__": 227 }, { - "__id__": 223 + "__id__": 229 } ], "_prefab": { - "__id__": 225 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -4110,11 +4236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 226 }, "_contentSize": { "__type__": "cc.Size", @@ -4138,11 +4264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 228 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4183,11 +4309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 230 }, "_alignFlags": 45, "_target": null, @@ -4232,11 +4358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -4260,11 +4386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 235 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4308,11 +4434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 237 }, "_alignFlags": 45, "_target": null, @@ -4357,27 +4483,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 234 + "__id__": 240 } ], "_active": false, "_components": [ { - "__id__": 242 + "__id__": 248 }, { - "__id__": 244 + "__id__": 250 }, { - "__id__": 246 + "__id__": 252 } ], "_prefab": { - "__id__": 248 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -4414,23 +4540,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 233 + "__id__": 239 }, "_children": [], "_active": true, "_components": [ { - "__id__": 235 + "__id__": 241 }, { - "__id__": 237 + "__id__": 243 }, { - "__id__": 239 + "__id__": 245 } ], "_prefab": { - "__id__": 241 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -4467,11 +4593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -4495,11 +4621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4543,11 +4669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 246 }, "_alignFlags": 45, "_target": null, @@ -4592,11 +4718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 249 }, "_contentSize": { "__type__": "cc.Size", @@ -4620,11 +4746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 251 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4668,11 +4794,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 253 }, "_alignFlags": 45, "_target": null, @@ -4717,27 +4843,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 250 + "__id__": 256 } ], "_active": false, "_components": [ { - "__id__": 258 + "__id__": 264 }, { - "__id__": 260 + "__id__": 266 }, { - "__id__": 262 + "__id__": 268 } ], "_prefab": { - "__id__": 264 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -4774,23 +4900,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 249 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 257 }, { - "__id__": 253 + "__id__": 259 }, { - "__id__": 255 + "__id__": 261 } ], "_prefab": { - "__id__": 257 + "__id__": 263 }, "_lpos": { "__type__": "cc.Vec3", @@ -4827,11 +4953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -4855,11 +4981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4903,11 +5029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 262 }, "_alignFlags": 45, "_target": null, @@ -4952,11 +5078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 265 }, "_contentSize": { "__type__": "cc.Size", @@ -4980,11 +5106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 267 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5028,11 +5154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 269 }, "_alignFlags": 45, "_target": null, @@ -5077,27 +5203,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 266 + "__id__": 272 } ], "_active": true, "_components": [ { - "__id__": 274 + "__id__": 280 }, { - "__id__": 276 + "__id__": 282 }, { - "__id__": 278 + "__id__": 284 } ], "_prefab": { - "__id__": 280 + "__id__": 286 }, "_lpos": { "__type__": "cc.Vec3", @@ -5134,23 +5260,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 265 + "__id__": 271 }, "_children": [], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 273 }, { - "__id__": 269 + "__id__": 275 }, { - "__id__": 271 + "__id__": 277 } ], "_prefab": { - "__id__": 273 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -5187,11 +5313,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -5215,11 +5341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 276 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5263,11 +5389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 278 }, "_alignFlags": 45, "_target": null, @@ -5312,11 +5438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 271 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -5340,11 +5466,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 271 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 283 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5388,11 +5514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 271 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 285 }, "_alignFlags": 45, "_target": null, @@ -5437,27 +5563,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 282 + "__id__": 288 }, { - "__id__": 290 + "__id__": 296 }, { - "__id__": 298 + "__id__": 304 } ], "_active": false, "_components": [ { - "__id__": 306 + "__id__": 312 } ], "_prefab": { - "__id__": 308 + "__id__": 314 }, "_lpos": { "__type__": "cc.Vec3", @@ -5494,23 +5620,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 287 }, "_children": [], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 289 }, { - "__id__": 285 + "__id__": 291 }, { - "__id__": 287 + "__id__": 293 } ], "_prefab": { - "__id__": 289 + "__id__": 295 }, "_lpos": { "__type__": "cc.Vec3", @@ -5547,11 +5673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -5575,11 +5701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5620,11 +5746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 294 }, "_alignFlags": 45, "_target": null, @@ -5669,23 +5795,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 287 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 297 }, { - "__id__": 293 + "__id__": 299 }, { - "__id__": 295 + "__id__": 301 } ], "_prefab": { - "__id__": 297 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", @@ -5722,11 +5848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 296 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 298 }, "_contentSize": { "__type__": "cc.Size", @@ -5750,11 +5876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 296 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 300 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5795,11 +5921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 296 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 302 }, "_alignFlags": 45, "_target": null, @@ -5844,23 +5970,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 287 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 305 }, { - "__id__": 301 + "__id__": 307 }, { - "__id__": 303 + "__id__": 309 } ], "_prefab": { - "__id__": 305 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -5897,11 +6023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -5925,11 +6051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 308 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5970,11 +6096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 310 }, "_alignFlags": 45, "_target": null, @@ -6019,11 +6145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 287 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 313 }, "_contentSize": { "__type__": "cc.Size", @@ -6060,11 +6186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -6088,11 +6214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 318 }, "_alignFlags": 45, "_target": null, @@ -6137,11 +6263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6201,20 +6327,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 316 + "__id__": 322 }, "_children": [], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 366 }, { - "__id__": 314 + "__id__": 320 } ], "_prefab": { - "__id__": 362 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -6253,27 +6379,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 317 + "__id__": 323 }, "_children": [ { - "__id__": 349 + "__id__": 355 }, { - "__id__": 315 + "__id__": 321 } ], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 361 }, { - "__id__": 357 + "__id__": 363 } ], "_prefab": { - "__id__": 359 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -6310,33 +6436,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 127 }, "_children": [ - { - "__id__": 318 - }, - { - "__id__": 316 - }, { "__id__": 324 + }, + { + "__id__": 322 + }, + { + "__id__": 330 } ], "_active": true, "_components": [ { - "__id__": 342 + "__id__": 348 }, { - "__id__": 344 + "__id__": 350 }, { - "__id__": 346 + "__id__": 352 } ], "_prefab": { - "__id__": 348 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -6375,20 +6501,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 317 + "__id__": 323 }, "_children": [], "_active": false, "_components": [ { - "__id__": 319 + "__id__": 325 }, { - "__id__": 321 + "__id__": 327 } ], "_prefab": { - "__id__": 323 + "__id__": 329 }, "_lpos": { "__type__": "cc.Vec3", @@ -6425,11 +6551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -6453,11 +6579,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6536,27 +6662,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 317 + "__id__": 323 }, "_children": [ { - "__id__": 325 + "__id__": 331 }, { - "__id__": 331 + "__id__": 337 } ], "_active": false, "_components": [ { - "__id__": 337 + "__id__": 343 }, { - "__id__": 339 + "__id__": 345 } ], "_prefab": { - "__id__": 341 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -6593,20 +6719,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 330 }, "_children": [], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 332 }, { - "__id__": 328 + "__id__": 334 } ], "_prefab": { - "__id__": 330 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -6643,11 +6769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -6671,11 +6797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6732,20 +6858,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 330 }, "_children": [], "_active": true, "_components": [ { - "__id__": 332 + "__id__": 338 }, { - "__id__": 334 + "__id__": 340 } ], "_prefab": { - "__id__": 336 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", @@ -6782,11 +6908,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -6810,11 +6936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6891,11 +7017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 344 }, "_contentSize": { "__type__": "cc.Size", @@ -6919,11 +7045,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 346 }, "_resizeMode": 1, "_layoutType": 1, @@ -6970,11 +7096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -6998,11 +7124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 351 }, "_alignFlags": 45, "_target": null, @@ -7034,11 +7160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 323 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 353 }, "_resizeMode": 1, "_layoutType": 2, @@ -7085,20 +7211,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 316 + "__id__": 322 }, "_children": [], "_active": true, "_components": [ { - "__id__": 350 + "__id__": 356 }, { - "__id__": 352 + "__id__": 358 } ], "_prefab": { - "__id__": 354 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -7135,11 +7261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -7163,11 +7289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 359 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7221,11 +7347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7249,11 +7375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 364 }, "_resizeMode": 1, "_layoutType": 1, @@ -7300,11 +7426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 367 }, "_contentSize": { "__type__": "cc.Size", @@ -7350,22 +7476,22 @@ "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": null, "targetOverrides": [ - { - "__id__": 365 - }, - { - "__id__": 367 - }, - { - "__id__": 369 - }, { "__id__": 371 + }, + { + "__id__": 373 + }, + { + "__id__": 375 + }, + { + "__id__": 377 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 121 + "__id__": 127 }, { "__id__": 40 @@ -7378,7 +7504,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 158 + "__id__": 164 }, "sourceInfo": null, "propertyPath": [ @@ -7388,7 +7514,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 366 + "__id__": 372 } }, { @@ -7400,7 +7526,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 158 + "__id__": 164 }, "sourceInfo": null, "propertyPath": [ @@ -7410,7 +7536,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 368 + "__id__": 374 } }, { @@ -7422,17 +7548,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 158 + "__id__": 164 }, "sourceInfo": null, "propertyPath": [ "cost_label" ], "target": { - "__id__": 121 + "__id__": 127 }, "targetInfo": { - "__id__": 370 + "__id__": 376 } }, { @@ -7444,15 +7570,15 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 126 + "__id__": 132 }, "sourceInfo": null, "propertyPath": [], "target": { - "__id__": 121 + "__id__": 127 }, "targetInfo": { - "__id__": 372 + "__id__": 378 } }, { diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab index cabc3c11..07dc8535 100644 --- a/assets/resources/gui/element/cHero.prefab +++ b/assets/resources/gui/element/cHero.prefab @@ -32,22 +32,25 @@ }, { "__id__": 158 + }, + { + "__id__": 191 } ], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 197 }, { - "__id__": 193 + "__id__": 199 }, { - "__id__": 195 + "__id__": 201 } ], "_prefab": { - "__id__": 401 + "__id__": 407 }, "_lpos": { "__type__": "cc.Vec3", @@ -1800,7 +1803,7 @@ "__id__": 143 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 151 @@ -2967,6 +2970,135 @@ "72Qmr45pdBjaa4/XGRGS5u" ] }, + { + "__type__": "cc.Node", + "_name": "RichText", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 192 + }, + { + "__id__": 194 + } + ], + "_prefab": { + "__id__": 196 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -37.386, + "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__": 191 + }, + "_enabled": true, + "__prefab": { + "__id__": 193 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 190, + "height": 26.46 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1f6Jh3w5FPeJ7RN7smscKO" + }, + { + "__type__": "cc.RichText", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 191 + }, + "_enabled": true, + "__prefab": { + "__id__": 195 + }, + "_lineHeight": 21, + "_string": "RichText", + "_horizontalAlign": 0, + "_verticalAlign": 0, + "_fontSize": 20, + "_fontColor": { + "__type__": "cc.Color", + "r": 32, + "g": 32, + "b": 32, + "a": 255 + }, + "_maxWidth": 190, + "_fontFamily": "Arial", + "_font": null, + "_isSystemFontUsed": true, + "_userDefinedFont": null, + "_cacheMode": 0, + "_imageAtlas": null, + "_handleTouchEvent": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "94G83rsRxKLqWHFK2KnEEG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d8vTn3m21MfYFpw16CKhro", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2977,7 +3109,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -3005,7 +3137,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 194 + "__id__": 200 }, "_alignFlags": 0, "_target": null, @@ -3041,13 +3173,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 202 }, "icon_node": { - "__id__": 197 + "__id__": 203 }, "bg_node": { - "__id__": 237 + "__id__": 243 }, "name_label": { "__id__": 24 @@ -3061,6 +3193,9 @@ "fied3": { "__id__": 146 }, + "info_rich": { + "__id__": 194 + }, "level_label": { "__id__": 30 }, @@ -3068,7 +3203,7 @@ "__id__": 158 }, "cost_label": { - "__id__": 351 + "__id__": 357 }, "_id": "" }, @@ -3082,20 +3217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 238 }, { - "__id__": 234 + "__id__": 240 } ], "_prefab": { - "__id__": 236 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -3135,39 +3270,39 @@ "__id__": 40 }, "_children": [ - { - "__id__": 199 - }, - { - "__id__": 197 - }, { "__id__": 205 }, + { + "__id__": 203 + }, { "__id__": 211 }, { "__id__": 217 + }, + { + "__id__": 223 } ], "_active": true, "_components": [ - { - "__id__": 223 - }, - { - "__id__": 225 - }, - { - "__id__": 227 - }, { "__id__": 229 + }, + { + "__id__": 231 + }, + { + "__id__": 233 + }, + { + "__id__": 235 } ], "_prefab": { - "__id__": 231 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -3204,20 +3339,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 206 }, { - "__id__": 202 + "__id__": 208 } ], "_prefab": { - "__id__": 204 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -3254,11 +3389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 207 }, "_contentSize": { "__type__": "cc.Size", @@ -3282,11 +3417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 209 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3340,143 +3475,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 206 - }, - { - "__id__": 208 - } - ], - "_prefab": { - "__id__": 210 - }, - "_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": 0.9, - "y": 0.9, - "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__": 205 - }, - "_enabled": true, - "__prefab": { - "__id__": 207 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 78, - "height": 78 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "acwGVgSsdCUIEmlLZVMZbN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 205 - }, - "_enabled": true, - "__prefab": { - "__id__": 209 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8dbZob0aNPQJ3mFkIF47XB" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "146QBwBOlH6LhCFATSJzVj", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "equip", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [], "_active": false, @@ -3546,7 +3545,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23LtSLPpxPLbmAJs09fdIw" + "fileId": "acwGVgSsdCUIEmlLZVMZbN" }, { "__type__": "cc.Sprite", @@ -3591,7 +3590,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dzgwgV3tNZJEoewp8KY38" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -3601,18 +3600,18 @@ "asset": { "__id__": 0 }, - "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "fileId": "146QBwBOlH6LhCFATSJzVj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "item", + "_name": "equip", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [], "_active": false, @@ -3682,7 +3681,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8GRaxM2BNv76iifo8Ck5A" + "fileId": "23LtSLPpxPLbmAJs09fdIw" }, { "__type__": "cc.Sprite", @@ -3725,6 +3724,142 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dzgwgV3tNZJEoewp8KY38" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 204 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 224 + }, + { + "__id__": 226 + } + ], + "_prefab": { + "__id__": 228 + }, + "_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": 0.9, + "y": 0.9, + "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__": 223 + }, + "_enabled": true, + "__prefab": { + "__id__": 225 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8GRaxM2BNv76iifo8Ck5A" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 223 + }, + "_enabled": true, + "__prefab": { + "__id__": 227 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, { "__type__": "cc.CompPrefabInfo", "fileId": "13FTxdrcpMHrkutB9UhlCj" @@ -3748,11 +3883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -3776,11 +3911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 232 }, "_type": 0, "_inverted": false, @@ -3798,11 +3933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 234 }, "_alignFlags": 45, "_target": null, @@ -3834,11 +3969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3893,11 +4028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -3921,11 +4056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3980,35 +4115,35 @@ }, "_children": [ { - "__id__": 238 + "__id__": 244 }, { - "__id__": 254 + "__id__": 260 }, { - "__id__": 270 + "__id__": 276 }, { - "__id__": 286 + "__id__": 292 }, { - "__id__": 302 + "__id__": 308 }, { - "__id__": 318 + "__id__": 324 } ], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 352 }, { - "__id__": 348 + "__id__": 354 } ], "_prefab": { - "__id__": 350 + "__id__": 356 }, "_lpos": { "__type__": "cc.Vec3", @@ -4045,27 +4180,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 239 + "__id__": 245 } ], "_active": false, "_components": [ { - "__id__": 247 + "__id__": 253 }, { - "__id__": 249 + "__id__": 255 }, { - "__id__": 251 + "__id__": 257 } ], "_prefab": { - "__id__": 253 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -4102,23 +4237,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 238 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ { - "__id__": 240 + "__id__": 246 }, { - "__id__": 242 + "__id__": 248 }, { - "__id__": 244 + "__id__": 250 } ], "_prefab": { - "__id__": 246 + "__id__": 252 }, "_lpos": { "__type__": "cc.Vec3", @@ -4155,11 +4290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 247 }, "_contentSize": { "__type__": "cc.Size", @@ -4183,11 +4318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 249 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4231,11 +4366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 251 }, "_alignFlags": 45, "_target": null, @@ -4280,11 +4415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 254 }, "_contentSize": { "__type__": "cc.Size", @@ -4308,11 +4443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 256 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4356,11 +4491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 258 }, "_alignFlags": 45, "_target": null, @@ -4405,27 +4540,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 255 + "__id__": 261 } ], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 269 }, { - "__id__": 265 + "__id__": 271 }, { - "__id__": 267 + "__id__": 273 } ], "_prefab": { - "__id__": 269 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -4462,23 +4597,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 254 + "__id__": 260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 256 + "__id__": 262 }, { - "__id__": 258 + "__id__": 264 }, { - "__id__": 260 + "__id__": 266 } ], "_prefab": { - "__id__": 262 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", @@ -4515,11 +4650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -4543,11 +4678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 265 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4588,11 +4723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 267 }, "_alignFlags": 45, "_target": null, @@ -4637,11 +4772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -4665,11 +4800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4713,11 +4848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 274 }, "_alignFlags": 45, "_target": null, @@ -4762,27 +4897,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 271 + "__id__": 277 } ], "_active": false, "_components": [ { - "__id__": 279 + "__id__": 285 }, { - "__id__": 281 + "__id__": 287 }, { - "__id__": 283 + "__id__": 289 } ], "_prefab": { - "__id__": 285 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -4819,23 +4954,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 270 + "__id__": 276 }, "_children": [], "_active": true, "_components": [ { - "__id__": 272 + "__id__": 278 }, { - "__id__": 274 + "__id__": 280 }, { - "__id__": 276 + "__id__": 282 } ], "_prefab": { - "__id__": 278 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -4872,11 +5007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", @@ -4900,11 +5035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 281 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4948,11 +5083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 283 }, "_alignFlags": 45, "_target": null, @@ -4997,11 +5132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 286 }, "_contentSize": { "__type__": "cc.Size", @@ -5025,11 +5160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 288 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5073,11 +5208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 290 }, "_alignFlags": 45, "_target": null, @@ -5122,27 +5257,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 287 + "__id__": 293 } ], "_active": false, "_components": [ { - "__id__": 295 + "__id__": 301 }, { - "__id__": 297 + "__id__": 303 }, { - "__id__": 299 + "__id__": 305 } ], "_prefab": { - "__id__": 301 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", @@ -5179,23 +5314,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 286 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ { - "__id__": 288 + "__id__": 294 }, { - "__id__": 290 + "__id__": 296 }, { - "__id__": 292 + "__id__": 298 } ], "_prefab": { - "__id__": 294 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -5232,11 +5367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 287 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -5260,11 +5395,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 287 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5308,11 +5443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 287 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 299 }, "_alignFlags": 45, "_target": null, @@ -5357,11 +5492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 286 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -5385,11 +5520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 286 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5433,11 +5568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 286 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 306 }, "_alignFlags": 45, "_target": null, @@ -5482,27 +5617,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 303 + "__id__": 309 } ], "_active": false, "_components": [ { - "__id__": 311 + "__id__": 317 }, { - "__id__": 313 + "__id__": 319 }, { - "__id__": 315 + "__id__": 321 } ], "_prefab": { - "__id__": 317 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -5539,23 +5674,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 302 + "__id__": 308 }, "_children": [], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 310 }, { - "__id__": 306 + "__id__": 312 }, { - "__id__": 308 + "__id__": 314 } ], "_prefab": { - "__id__": 310 + "__id__": 316 }, "_lpos": { "__type__": "cc.Vec3", @@ -5592,11 +5727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 311 }, "_contentSize": { "__type__": "cc.Size", @@ -5620,11 +5755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 313 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5668,11 +5803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 315 }, "_alignFlags": 45, "_target": null, @@ -5717,11 +5852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -5745,11 +5880,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5793,11 +5928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 322 }, "_alignFlags": 45, "_target": null, @@ -5842,27 +5977,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 243 }, "_children": [ { - "__id__": 319 + "__id__": 325 }, { - "__id__": 327 + "__id__": 333 }, { - "__id__": 335 + "__id__": 341 } ], "_active": false, "_components": [ { - "__id__": 343 + "__id__": 349 } ], "_prefab": { - "__id__": 345 + "__id__": 351 }, "_lpos": { "__type__": "cc.Vec3", @@ -5899,23 +6034,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 318 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 320 + "__id__": 326 }, { - "__id__": 322 + "__id__": 328 }, { - "__id__": 324 + "__id__": 330 } ], "_prefab": { - "__id__": 326 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -5952,11 +6087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 327 }, "_contentSize": { "__type__": "cc.Size", @@ -5980,11 +6115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 329 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6025,11 +6160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 331 }, "_alignFlags": 45, "_target": null, @@ -6074,23 +6209,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 318 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 328 + "__id__": 334 }, { - "__id__": 330 + "__id__": 336 }, { - "__id__": 332 + "__id__": 338 } ], "_prefab": { - "__id__": 334 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -6127,11 +6262,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -6155,11 +6290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6200,11 +6335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 339 }, "_alignFlags": 45, "_target": null, @@ -6249,23 +6384,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 318 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 336 + "__id__": 342 }, { - "__id__": 338 + "__id__": 344 }, { - "__id__": 340 + "__id__": 346 } ], "_prefab": { - "__id__": 342 + "__id__": 348 }, "_lpos": { "__type__": "cc.Vec3", @@ -6302,11 +6437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -6330,11 +6465,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 345 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6375,11 +6510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 347 }, "_alignFlags": 45, "_target": null, @@ -6424,11 +6559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -6465,11 +6600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 353 }, "_contentSize": { "__type__": "cc.Size", @@ -6493,11 +6628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 355 }, "_alignFlags": 45, "_target": null, @@ -6542,11 +6677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 358 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 406 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6606,20 +6741,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 353 + "__id__": 359 }, "_children": [], "_active": true, "_components": [ { - "__id__": 397 + "__id__": 403 }, { - "__id__": 351 + "__id__": 357 } ], "_prefab": { - "__id__": 399 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -6658,27 +6793,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 354 + "__id__": 360 }, "_children": [ { - "__id__": 386 + "__id__": 392 }, { - "__id__": 352 + "__id__": 358 } ], "_active": true, "_components": [ { - "__id__": 392 + "__id__": 398 }, { - "__id__": 394 + "__id__": 400 } ], "_prefab": { - "__id__": 396 + "__id__": 402 }, "_lpos": { "__type__": "cc.Vec3", @@ -6718,30 +6853,30 @@ "__id__": 158 }, "_children": [ - { - "__id__": 355 - }, - { - "__id__": 353 - }, { "__id__": 361 + }, + { + "__id__": 359 + }, + { + "__id__": 367 } ], "_active": true, "_components": [ { - "__id__": 379 + "__id__": 385 }, { - "__id__": 381 + "__id__": 387 }, { - "__id__": 383 + "__id__": 389 } ], "_prefab": { - "__id__": 385 + "__id__": 391 }, "_lpos": { "__type__": "cc.Vec3", @@ -6780,20 +6915,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 354 + "__id__": 360 }, "_children": [], "_active": false, "_components": [ { - "__id__": 356 + "__id__": 362 }, { - "__id__": 358 + "__id__": 364 } ], "_prefab": { - "__id__": 360 + "__id__": 366 }, "_lpos": { "__type__": "cc.Vec3", @@ -6830,11 +6965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", @@ -6858,11 +6993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 365 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6941,27 +7076,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 354 + "__id__": 360 }, "_children": [ { - "__id__": 362 + "__id__": 368 }, { - "__id__": 368 + "__id__": 374 } ], "_active": false, "_components": [ { - "__id__": 374 + "__id__": 380 }, { - "__id__": 376 + "__id__": 382 } ], "_prefab": { - "__id__": 378 + "__id__": 384 }, "_lpos": { "__type__": "cc.Vec3", @@ -6998,20 +7133,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 361 + "__id__": 367 }, "_children": [], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 369 }, { - "__id__": 365 + "__id__": 371 } ], "_prefab": { - "__id__": 367 + "__id__": 373 }, "_lpos": { "__type__": "cc.Vec3", @@ -7048,11 +7183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -7076,11 +7211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 372 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7137,20 +7272,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 361 + "__id__": 367 }, "_children": [], "_active": true, "_components": [ { - "__id__": 369 + "__id__": 375 }, { - "__id__": 371 + "__id__": 377 } ], "_prefab": { - "__id__": 373 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -7187,11 +7322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -7215,11 +7350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7296,11 +7431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 367 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -7324,11 +7459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 367 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 383 }, "_resizeMode": 1, "_layoutType": 1, @@ -7375,11 +7510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 386 }, "_contentSize": { "__type__": "cc.Size", @@ -7403,11 +7538,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 388 }, "_alignFlags": 45, "_target": null, @@ -7439,11 +7574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 390 }, "_resizeMode": 1, "_layoutType": 2, @@ -7490,20 +7625,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 353 + "__id__": 359 }, "_children": [], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 393 }, { - "__id__": 389 + "__id__": 395 } ], "_prefab": { - "__id__": 391 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -7540,11 +7675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 394 }, "_contentSize": { "__type__": "cc.Size", @@ -7568,11 +7703,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 386 + "__id__": 392 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 396 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7626,11 +7761,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 399 }, "_contentSize": { "__type__": "cc.Size", @@ -7654,11 +7789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 359 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 401 }, "_resizeMode": 1, "_layoutType": 1, @@ -7705,11 +7840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 352 + "__id__": 358 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 404 }, "_contentSize": { "__type__": "cc.Size", @@ -7755,17 +7890,17 @@ "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": null, "targetOverrides": [ - { - "__id__": 402 - }, - { - "__id__": 404 - }, - { - "__id__": 406 - }, { "__id__": 408 + }, + { + "__id__": 410 + }, + { + "__id__": 412 + }, + { + "__id__": 414 } ], "nestedPrefabInstanceRoots": [ @@ -7783,7 +7918,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 195 + "__id__": 201 }, "sourceInfo": null, "propertyPath": [ @@ -7793,7 +7928,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 403 + "__id__": 409 } }, { @@ -7805,7 +7940,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 195 + "__id__": 201 }, "sourceInfo": null, "propertyPath": [ @@ -7815,7 +7950,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 405 + "__id__": 411 } }, { @@ -7827,7 +7962,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 195 + "__id__": 201 }, "sourceInfo": null, "propertyPath": [ @@ -7837,7 +7972,7 @@ "__id__": 158 }, "targetInfo": { - "__id__": 407 + "__id__": 413 } }, { @@ -7857,7 +7992,7 @@ "__id__": 158 }, "targetInfo": { - "__id__": 409 + "__id__": 415 } }, { diff --git a/assets/resources/gui/element/cItem.prefab b/assets/resources/gui/element/cItem.prefab index 2934897d..0fef10b8 100644 --- a/assets/resources/gui/element/cItem.prefab +++ b/assets/resources/gui/element/cItem.prefab @@ -2374,7 +2374,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 189.9, - "height": 26.46 + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/gui/element/cSkill.prefab b/assets/resources/gui/element/cSkill.prefab index 5da068df..140472cf 100644 --- a/assets/resources/gui/element/cSkill.prefab +++ b/assets/resources/gui/element/cSkill.prefab @@ -2194,7 +2194,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 190, - "height": 26.46 + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/gui/element/hnode.prefab b/assets/resources/gui/element/hnode.prefab index 891297b7..37e9b237 100644 --- a/assets/resources/gui/element/hnode.prefab +++ b/assets/resources/gui/element/hnode.prefab @@ -34,41 +34,41 @@ "__id__": 47 }, { - "__id__": 87 + "__id__": 96 }, { - "__id__": 95 + "__id__": 104 }, { - "__id__": 103 + "__id__": 112 }, { - "__id__": 141 + "__id__": 150 }, { - "__id__": 157 + "__id__": 166 }, { - "__id__": 173 + "__id__": 182 }, { - "__id__": 277 + "__id__": 286 } ], "_active": true, "_components": [ { - "__id__": 316 + "__id__": 325 }, { - "__id__": 318 + "__id__": 327 }, { - "__id__": 474 + "__id__": 483 } ], "_prefab": { - "__id__": 476 + "__id__": 485 }, "_lpos": { "__type__": "cc.Vec3", @@ -1047,11 +1047,29 @@ }, { "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, + { + "__id__": 92 + }, + { + "__id__": 94 } ], "removedComponents": [ { - "__id__": 86 + "__id__": 95 } ] }, @@ -1412,6 +1430,102 @@ "93fFoXu3BBYqu4RLG2YPon" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@46381", + "__expectedType__": "cc.SpriteFrame" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8dbZob0aNPQJ3mFkIF47XB" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_atlas" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", + "__expectedType__": "cc.SpriteAtlas" + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 90 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e9823", + "__expectedType__": "cc.SpriteFrame" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5dzgwgV3tNZJEoewp8KY38" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 90 + }, + "propertyPath": [ + "_atlas" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", + "__expectedType__": "cc.SpriteAtlas" + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e9823", + "__expectedType__": "cc.SpriteFrame" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "13FTxdrcpMHrkutB9UhlCj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 93 + }, + "propertyPath": [ + "_atlas" + ], + "value": { + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", + "__expectedType__": "cc.SpriteAtlas" + } + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -1430,17 +1544,17 @@ "_active": true, "_components": [ { - "__id__": 88 + "__id__": 97 }, { - "__id__": 90 + "__id__": 99 }, { - "__id__": 92 + "__id__": 101 } ], "_prefab": { - "__id__": 94 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -1477,11 +1591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -1505,11 +1619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1573,11 +1687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 102 }, "_alignFlags": 9, "_target": null, @@ -1628,17 +1742,17 @@ "_active": true, "_components": [ { - "__id__": 96 + "__id__": 105 }, { - "__id__": 98 + "__id__": 107 }, { - "__id__": 100 + "__id__": 109 } ], "_prefab": { - "__id__": 102 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1675,11 +1789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 106 }, "_contentSize": { "__type__": "cc.Size", @@ -1703,11 +1817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 108 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1771,11 +1885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 110 }, "_alignFlags": 9, "_target": null, @@ -1824,35 +1938,35 @@ }, "_children": [ { - "__id__": 104 + "__id__": 113 }, { - "__id__": 110 + "__id__": 119 }, { - "__id__": 116 + "__id__": 125 }, { - "__id__": 122 + "__id__": 131 }, { - "__id__": 128 + "__id__": 137 } ], "_active": false, "_components": [ { - "__id__": 134 + "__id__": 143 }, { - "__id__": 136 + "__id__": 145 }, { - "__id__": 138 + "__id__": 147 } ], "_prefab": { - "__id__": 140 + "__id__": 149 }, "_lpos": { "__type__": "cc.Vec3", @@ -1889,20 +2003,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 114 }, { - "__id__": 107 + "__id__": 116 } ], "_prefab": { - "__id__": 109 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -1939,11 +2053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -1967,11 +2081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2028,20 +2142,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 120 }, { - "__id__": 113 + "__id__": 122 } ], "_prefab": { - "__id__": 115 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -2078,11 +2192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -2106,11 +2220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2167,20 +2281,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 126 }, { - "__id__": 119 + "__id__": 128 } ], "_prefab": { - "__id__": 121 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -2217,11 +2331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", @@ -2245,11 +2359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2306,20 +2420,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 112 }, "_children": [], "_active": false, "_components": [ { - "__id__": 123 + "__id__": 132 }, { - "__id__": 125 + "__id__": 134 } ], "_prefab": { - "__id__": 127 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2356,11 +2470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -2384,11 +2498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2445,20 +2559,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 112 }, "_children": [], "_active": false, "_components": [ { - "__id__": 129 + "__id__": 138 }, { - "__id__": 131 + "__id__": 140 } ], "_prefab": { - "__id__": 133 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -2495,11 +2609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 139 }, "_contentSize": { "__type__": "cc.Size", @@ -2523,11 +2637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2584,11 +2698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 144 }, "_contentSize": { "__type__": "cc.Size", @@ -2612,11 +2726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 146 }, "_resizeMode": 1, "_layoutType": 1, @@ -2650,11 +2764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 148 }, "_alignFlags": 16, "_target": null, @@ -2703,26 +2817,26 @@ }, "_children": [ { - "__id__": 142 + "__id__": 151 } ], "_active": false, "_components": [ { - "__id__": 148 + "__id__": 157 }, { - "__id__": 150 + "__id__": 159 }, { - "__id__": 152 + "__id__": 161 }, { - "__id__": 154 + "__id__": 163 } ], "_prefab": { - "__id__": 156 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -2759,20 +2873,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 141 + "__id__": 150 }, "_children": [], "_active": true, "_components": [ { - "__id__": 143 + "__id__": 152 }, { - "__id__": 145 + "__id__": 154 } ], "_prefab": { - "__id__": 147 + "__id__": 156 }, "_lpos": { "__type__": "cc.Vec3", @@ -2809,11 +2923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 153 }, "_contentSize": { "__type__": "cc.Size", @@ -2837,11 +2951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 155 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2918,11 +3032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -2946,11 +3060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2994,11 +3108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 162 }, "clickEvents": [], "_interactable": true, @@ -3038,7 +3152,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 141 + "__id__": 150 }, "_id": "" }, @@ -3052,11 +3166,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 150 }, "_enabled": false, "__prefab": { - "__id__": 155 + "__id__": 164 }, "_alignFlags": 44, "_target": null, @@ -3105,26 +3219,26 @@ }, "_children": [ { - "__id__": 158 + "__id__": 167 } ], "_active": false, "_components": [ { - "__id__": 164 + "__id__": 173 }, { - "__id__": 166 + "__id__": 175 }, { - "__id__": 168 + "__id__": 177 }, { - "__id__": 170 + "__id__": 179 } ], "_prefab": { - "__id__": 172 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -3161,20 +3275,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 157 + "__id__": 166 }, "_children": [], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 168 }, { - "__id__": 161 + "__id__": 170 } ], "_prefab": { - "__id__": 163 + "__id__": 172 }, "_lpos": { "__type__": "cc.Vec3", @@ -3211,11 +3325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 169 }, "_contentSize": { "__type__": "cc.Size", @@ -3239,11 +3353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 171 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3320,11 +3434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 174 }, "_contentSize": { "__type__": "cc.Size", @@ -3348,11 +3462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 176 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3396,11 +3510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 178 }, "clickEvents": [], "_interactable": true, @@ -3440,7 +3554,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 157 + "__id__": 166 }, "_id": "" }, @@ -3454,11 +3568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 166 }, "_enabled": false, "__prefab": { - "__id__": 171 + "__id__": 180 }, "_alignFlags": 44, "_target": null, @@ -3507,29 +3621,29 @@ }, "_children": [ { - "__id__": 174 + "__id__": 183 }, { - "__id__": 202 + "__id__": 211 }, { - "__id__": 236 + "__id__": 245 } ], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 279 }, { - "__id__": 272 + "__id__": 281 }, { - "__id__": 274 + "__id__": 283 } ], "_prefab": { - "__id__": 276 + "__id__": 285 }, "_lpos": { "__type__": "cc.Vec3", @@ -3566,33 +3680,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 182 }, "_children": [ { - "__id__": 175 + "__id__": 184 }, { - "__id__": 183 + "__id__": 192 }, { - "__id__": 189 + "__id__": 198 } ], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 204 }, { - "__id__": 197 + "__id__": 206 }, { - "__id__": 199 + "__id__": 208 } ], "_prefab": { - "__id__": 201 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -3629,23 +3743,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 183 }, "_children": [], "_active": false, "_components": [ { - "__id__": 176 + "__id__": 185 }, { - "__id__": 178 + "__id__": 187 }, { - "__id__": 180 + "__id__": 189 } ], "_prefab": { - "__id__": 182 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -3682,11 +3796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 186 }, "_contentSize": { "__type__": "cc.Size", @@ -3710,11 +3824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3758,11 +3872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 190 }, "_alignFlags": 45, "_target": null, @@ -3807,20 +3921,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 183 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 193 }, { - "__id__": 186 + "__id__": 195 } ], "_prefab": { - "__id__": 188 + "__id__": 197 }, "_lpos": { "__type__": "cc.Vec3", @@ -3857,11 +3971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 194 }, "_contentSize": { "__type__": "cc.Size", @@ -3885,11 +3999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 196 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3946,20 +4060,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 183 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 199 }, { - "__id__": 192 + "__id__": 201 } ], "_prefab": { - "__id__": 194 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -3996,11 +4110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -4024,11 +4138,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4105,11 +4219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 183 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 205 }, "_contentSize": { "__type__": "cc.Size", @@ -4133,11 +4247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 183 }, "_enabled": false, "__prefab": { - "__id__": 198 + "__id__": 207 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4178,11 +4292,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 183 }, "_enabled": false, "__prefab": { - "__id__": 200 + "__id__": 209 }, "_alignFlags": 44, "_target": null, @@ -4227,36 +4341,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 182 }, "_children": [ { - "__id__": 203 + "__id__": 212 }, { - "__id__": 211 + "__id__": 220 }, { - "__id__": 217 + "__id__": 226 }, { - "__id__": 223 + "__id__": 232 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 238 }, { - "__id__": 231 + "__id__": 240 }, { - "__id__": 233 + "__id__": 242 } ], "_prefab": { - "__id__": 235 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -4293,23 +4407,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 211 }, "_children": [], "_active": false, "_components": [ { - "__id__": 204 + "__id__": 213 }, { - "__id__": 206 + "__id__": 215 }, { - "__id__": 208 + "__id__": 217 } ], "_prefab": { - "__id__": 210 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -4346,11 +4460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 214 }, "_contentSize": { "__type__": "cc.Size", @@ -4374,11 +4488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 216 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4422,11 +4536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 218 }, "_alignFlags": 45, "_target": null, @@ -4471,20 +4585,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 221 }, { - "__id__": 214 + "__id__": 223 } ], "_prefab": { - "__id__": 216 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -4521,11 +4635,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -4549,11 +4663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4610,20 +4724,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 218 + "__id__": 227 }, { - "__id__": 220 + "__id__": 229 } ], "_prefab": { - "__id__": 222 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -4660,11 +4774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -4688,11 +4802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4769,20 +4883,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 233 }, { - "__id__": 226 + "__id__": 235 } ], "_prefab": { - "__id__": 228 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -4819,11 +4933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -4847,11 +4961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4928,11 +5042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -4956,11 +5070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 211 }, "_enabled": false, "__prefab": { - "__id__": 232 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5001,11 +5115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 211 }, "_enabled": false, "__prefab": { - "__id__": 234 + "__id__": 243 }, "_alignFlags": 44, "_target": null, @@ -5050,36 +5164,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 182 }, "_children": [ { - "__id__": 237 + "__id__": 246 }, { - "__id__": 245 + "__id__": 254 }, { - "__id__": 251 + "__id__": 260 }, { - "__id__": 257 + "__id__": 266 } ], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 272 }, { - "__id__": 265 + "__id__": 274 }, { - "__id__": 267 + "__id__": 276 } ], "_prefab": { - "__id__": 269 + "__id__": 278 }, "_lpos": { "__type__": "cc.Vec3", @@ -5116,23 +5230,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 236 + "__id__": 245 }, "_children": [], "_active": false, "_components": [ { - "__id__": 238 + "__id__": 247 }, { - "__id__": 240 + "__id__": 249 }, { - "__id__": 242 + "__id__": 251 } ], "_prefab": { - "__id__": 244 + "__id__": 253 }, "_lpos": { "__type__": "cc.Vec3", @@ -5169,11 +5283,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 248 }, "_contentSize": { "__type__": "cc.Size", @@ -5197,11 +5311,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 250 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5245,11 +5359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 252 }, "_alignFlags": 45, "_target": null, @@ -5294,20 +5408,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 236 + "__id__": 245 }, "_children": [], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 255 }, { - "__id__": 248 + "__id__": 257 } ], "_prefab": { - "__id__": 250 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -5344,11 +5458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 256 }, "_contentSize": { "__type__": "cc.Size", @@ -5372,11 +5486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 258 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5430,20 +5544,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 236 + "__id__": 245 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 261 }, { - "__id__": 254 + "__id__": 263 } ], "_prefab": { - "__id__": 256 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -5480,11 +5594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -5508,11 +5622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5589,20 +5703,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 236 + "__id__": 245 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 267 }, { - "__id__": 260 + "__id__": 269 } ], "_prefab": { - "__id__": 262 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -5639,11 +5753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -5667,11 +5781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 270 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5748,11 +5862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 273 }, "_contentSize": { "__type__": "cc.Size", @@ -5776,11 +5890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 245 }, "_enabled": false, "__prefab": { - "__id__": 266 + "__id__": 275 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5821,11 +5935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 236 + "__id__": 245 }, "_enabled": false, "__prefab": { - "__id__": 268 + "__id__": 277 }, "_alignFlags": 44, "_target": null, @@ -5870,11 +5984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", @@ -5898,11 +6012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 282 }, "_alignFlags": 40, "_target": null, @@ -5934,11 +6048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 284 }, "_resizeMode": 1, "_layoutType": 3, @@ -5989,26 +6103,26 @@ }, "_children": [ { - "__id__": 278 + "__id__": 287 }, { - "__id__": 299 + "__id__": 308 } ], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 318 }, { - "__id__": 311 + "__id__": 320 }, { - "__id__": 313 + "__id__": 322 } ], "_prefab": { - "__id__": 315 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -6043,17 +6157,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 277 + "__id__": 286 }, "_prefab": { - "__id__": 279 + "__id__": 288 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 278 + "__id__": 287 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -6061,7 +6175,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 280 + "__id__": 289 }, "targetOverrides": null }, @@ -6074,41 +6188,41 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 281 - }, - { - "__id__": 283 - }, - { - "__id__": 284 - }, - { - "__id__": 285 - }, - { - "__id__": 286 - }, - { - "__id__": 288 - }, { "__id__": 290 }, { "__id__": 292 }, + { + "__id__": 293 + }, { "__id__": 294 }, { - "__id__": 296 + "__id__": 295 }, { "__id__": 297 }, { - "__id__": 298 + "__id__": 299 + }, + { + "__id__": 301 + }, + { + "__id__": 303 + }, + { + "__id__": 305 + }, + { + "__id__": 306 + }, + { + "__id__": 307 } ], "removedComponents": [] @@ -6116,7 +6230,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 282 + "__id__": 291 }, "propertyPath": [ "_name" @@ -6132,7 +6246,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 282 + "__id__": 291 }, "propertyPath": [ "_lpos" @@ -6147,7 +6261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 282 + "__id__": 291 }, "propertyPath": [ "_lrot" @@ -6163,7 +6277,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 282 + "__id__": 291 }, "propertyPath": [ "_euler" @@ -6178,7 +6292,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 287 + "__id__": 296 }, "propertyPath": [ "_contentSize" @@ -6198,7 +6312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 289 + "__id__": 298 }, "propertyPath": [ "_contentSize" @@ -6218,7 +6332,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 291 + "__id__": 300 }, "propertyPath": [ "_contentSize" @@ -6238,7 +6352,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 293 + "__id__": 302 }, "propertyPath": [ "_active" @@ -6254,7 +6368,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 304 }, "propertyPath": [ "_alignFlags" @@ -6270,7 +6384,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 304 }, "propertyPath": [ "_bottom" @@ -6280,7 +6394,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 304 }, "propertyPath": [ "_originalHeight" @@ -6290,7 +6404,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 304 }, "propertyPath": [ "_top" @@ -6303,26 +6417,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 277 + "__id__": 286 }, "_children": [], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 309 }, { - "__id__": 302 + "__id__": 311 }, { - "__id__": 304 + "__id__": 313 }, { - "__id__": 306 + "__id__": 315 } ], "_prefab": { - "__id__": 308 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -6359,11 +6473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 310 }, "_contentSize": { "__type__": "cc.Size", @@ -6387,11 +6501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 312 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6455,11 +6569,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 314 }, "_alignFlags": 45, "_target": null, @@ -6491,11 +6605,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 308 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 316 }, "_resizeMode": 0, "_layoutType": 2, @@ -6542,11 +6656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -6570,11 +6684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 321 }, "_alignFlags": 44, "_target": null, @@ -6606,11 +6720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 286 }, "_enabled": false, "__prefab": { - "__id__": 314 + "__id__": 323 }, "_resizeMode": 1, "_layoutType": 3, @@ -6661,7 +6775,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -6689,36 +6803,36 @@ }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 328 }, "icon_node": { - "__id__": 320 + "__id__": 329 }, "skill_icon_node": { - "__id__": 328 + "__id__": 337 }, "sell_node": null, "BG_node": { - "__id__": 360 + "__id__": 369 }, "close_node": null, "Name_node": { - "__id__": 87 + "__id__": 96 }, "info_node": { - "__id__": 299 + "__id__": 308 }, "lv_node": { - "__id__": 98 + "__id__": 107 }, "ap_node": { - "__id__": 202 + "__id__": 211 }, "hp_node": { - "__id__": 236 + "__id__": 245 }, "cd_node": { - "__id__": 174 + "__id__": 183 }, "_id": "" }, @@ -6732,20 +6846,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 330 }, "_children": [], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 364 }, { - "__id__": 357 + "__id__": 366 } ], "_prefab": { - "__id__": 359 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -6786,38 +6900,38 @@ }, "_children": [ { - "__id__": 322 + "__id__": 331 }, { - "__id__": 320 + "__id__": 329 }, { - "__id__": 328 + "__id__": 337 }, { - "__id__": 334 + "__id__": 343 }, { - "__id__": 340 + "__id__": 349 } ], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 355 }, { - "__id__": 348 + "__id__": 357 }, { - "__id__": 350 + "__id__": 359 }, { - "__id__": 352 + "__id__": 361 } ], "_prefab": { - "__id__": 354 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -6854,20 +6968,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 330 }, "_children": [], "_active": true, "_components": [ { - "__id__": 323 + "__id__": 332 }, { - "__id__": 325 + "__id__": 334 } ], "_prefab": { - "__id__": 327 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -6904,11 +7018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -6932,11 +7046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6990,20 +7104,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 330 }, "_children": [], "_active": false, "_components": [ { - "__id__": 329 + "__id__": 338 }, { - "__id__": 331 + "__id__": 340 } ], "_prefab": { - "__id__": 333 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", @@ -7040,11 +7154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -7068,11 +7182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7085,7 +7199,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@46381", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -7101,7 +7215,7 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" @@ -7129,20 +7243,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 330 }, "_children": [], "_active": false, "_components": [ { - "__id__": 335 + "__id__": 344 }, { - "__id__": 337 + "__id__": 346 } ], "_prefab": { - "__id__": 339 + "__id__": 348 }, "_lpos": { "__type__": "cc.Vec3", @@ -7179,11 +7293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 345 }, "_contentSize": { "__type__": "cc.Size", @@ -7207,11 +7321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 347 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7224,7 +7338,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e9823", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -7240,7 +7354,7 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" @@ -7268,20 +7382,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 330 }, "_children": [], "_active": false, "_components": [ { - "__id__": 341 + "__id__": 350 }, { - "__id__": 343 + "__id__": 352 } ], "_prefab": { - "__id__": 345 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -7318,11 +7432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 351 }, "_contentSize": { "__type__": "cc.Size", @@ -7346,11 +7460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 353 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7363,7 +7477,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05@e9823", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -7379,7 +7493,7 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__uuid__": "1fda2882-2baf-4446-96cc-492ef2722f05", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" @@ -7407,11 +7521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -7435,11 +7549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 358 }, "_type": 0, "_inverted": false, @@ -7457,11 +7571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 360 }, "_alignFlags": 45, "_target": null, @@ -7493,11 +7607,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 362 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7552,11 +7666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -7580,11 +7694,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7645,35 +7759,35 @@ }, "_children": [ { - "__id__": 361 + "__id__": 370 }, { - "__id__": 377 + "__id__": 386 }, { - "__id__": 393 + "__id__": 402 }, { - "__id__": 409 + "__id__": 418 }, { - "__id__": 425 + "__id__": 434 }, { - "__id__": 441 + "__id__": 450 } ], "_active": true, "_components": [ { - "__id__": 469 + "__id__": 478 }, { - "__id__": 471 + "__id__": 480 } ], "_prefab": { - "__id__": 473 + "__id__": 482 }, "_lpos": { "__type__": "cc.Vec3", @@ -7710,27 +7824,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 362 + "__id__": 371 } ], "_active": true, "_components": [ { - "__id__": 370 + "__id__": 379 }, { - "__id__": 372 + "__id__": 381 }, { - "__id__": 374 + "__id__": 383 } ], "_prefab": { - "__id__": 376 + "__id__": 385 }, "_lpos": { "__type__": "cc.Vec3", @@ -7767,23 +7881,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 361 + "__id__": 370 }, "_children": [], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 372 }, { - "__id__": 365 + "__id__": 374 }, { - "__id__": 367 + "__id__": 376 } ], "_prefab": { - "__id__": 369 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", @@ -7820,11 +7934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 373 }, "_contentSize": { "__type__": "cc.Size", @@ -7848,11 +7962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 375 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7896,11 +8010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 377 }, "_alignFlags": 45, "_target": null, @@ -7945,11 +8059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 370 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 380 }, "_contentSize": { "__type__": "cc.Size", @@ -7973,11 +8087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 370 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8021,11 +8135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 370 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 384 }, "_alignFlags": 45, "_target": null, @@ -8070,27 +8184,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 378 + "__id__": 387 } ], "_active": true, "_components": [ { - "__id__": 386 + "__id__": 395 }, { - "__id__": 388 + "__id__": 397 }, { - "__id__": 390 + "__id__": 399 } ], "_prefab": { - "__id__": 392 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -8127,23 +8241,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 377 + "__id__": 386 }, "_children": [], "_active": true, "_components": [ { - "__id__": 379 + "__id__": 388 }, { - "__id__": 381 + "__id__": 390 }, { - "__id__": 383 + "__id__": 392 } ], "_prefab": { - "__id__": 385 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -8180,11 +8294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 389 }, "_contentSize": { "__type__": "cc.Size", @@ -8208,11 +8322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 391 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8253,11 +8367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 393 }, "_alignFlags": 45, "_target": null, @@ -8302,11 +8416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 396 }, "_contentSize": { "__type__": "cc.Size", @@ -8330,11 +8444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 398 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8378,11 +8492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 400 }, "_alignFlags": 45, "_target": null, @@ -8427,27 +8541,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 394 + "__id__": 403 } ], "_active": false, "_components": [ { - "__id__": 402 + "__id__": 411 }, { - "__id__": 404 + "__id__": 413 }, { - "__id__": 406 + "__id__": 415 } ], "_prefab": { - "__id__": 408 + "__id__": 417 }, "_lpos": { "__type__": "cc.Vec3", @@ -8484,23 +8598,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 393 + "__id__": 402 }, "_children": [], "_active": true, "_components": [ { - "__id__": 395 + "__id__": 404 }, { - "__id__": 397 + "__id__": 406 }, { - "__id__": 399 + "__id__": 408 } ], "_prefab": { - "__id__": 401 + "__id__": 410 }, "_lpos": { "__type__": "cc.Vec3", @@ -8537,11 +8651,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 405 }, "_contentSize": { "__type__": "cc.Size", @@ -8565,11 +8679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 407 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8613,11 +8727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 403 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 409 }, "_alignFlags": 45, "_target": null, @@ -8662,11 +8776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 393 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 412 }, "_contentSize": { "__type__": "cc.Size", @@ -8690,11 +8804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 393 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 414 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8738,11 +8852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 393 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 416 }, "_alignFlags": 45, "_target": null, @@ -8787,27 +8901,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 410 + "__id__": 419 } ], "_active": false, "_components": [ { - "__id__": 418 + "__id__": 427 }, { - "__id__": 420 + "__id__": 429 }, { - "__id__": 422 + "__id__": 431 } ], "_prefab": { - "__id__": 424 + "__id__": 433 }, "_lpos": { "__type__": "cc.Vec3", @@ -8844,23 +8958,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 409 + "__id__": 418 }, "_children": [], "_active": true, "_components": [ { - "__id__": 411 + "__id__": 420 }, { - "__id__": 413 + "__id__": 422 }, { - "__id__": 415 + "__id__": 424 } ], "_prefab": { - "__id__": 417 + "__id__": 426 }, "_lpos": { "__type__": "cc.Vec3", @@ -8897,11 +9011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 421 }, "_contentSize": { "__type__": "cc.Size", @@ -8925,11 +9039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 423 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8973,11 +9087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 425 }, "_alignFlags": 45, "_target": null, @@ -9022,11 +9136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 428 }, "_contentSize": { "__type__": "cc.Size", @@ -9050,11 +9164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 430 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9098,11 +9212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 432 }, "_alignFlags": 45, "_target": null, @@ -9147,27 +9261,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 426 + "__id__": 435 } ], "_active": false, "_components": [ { - "__id__": 434 + "__id__": 443 }, { - "__id__": 436 + "__id__": 445 }, { - "__id__": 438 + "__id__": 447 } ], "_prefab": { - "__id__": 440 + "__id__": 449 }, "_lpos": { "__type__": "cc.Vec3", @@ -9204,23 +9318,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 425 + "__id__": 434 }, "_children": [], "_active": true, "_components": [ { - "__id__": 427 + "__id__": 436 }, { - "__id__": 429 + "__id__": 438 }, { - "__id__": 431 + "__id__": 440 } ], "_prefab": { - "__id__": 433 + "__id__": 442 }, "_lpos": { "__type__": "cc.Vec3", @@ -9257,11 +9371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -9285,11 +9399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9333,11 +9447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 441 }, "_alignFlags": 45, "_target": null, @@ -9382,11 +9496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 444 }, "_contentSize": { "__type__": "cc.Size", @@ -9410,11 +9524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 446 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9458,11 +9572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 425 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 448 }, "_alignFlags": 45, "_target": null, @@ -9507,27 +9621,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 360 + "__id__": 369 }, "_children": [ { - "__id__": 442 + "__id__": 451 }, { - "__id__": 450 + "__id__": 459 }, { - "__id__": 458 + "__id__": 467 } ], "_active": false, "_components": [ { - "__id__": 466 + "__id__": 475 } ], "_prefab": { - "__id__": 468 + "__id__": 477 }, "_lpos": { "__type__": "cc.Vec3", @@ -9564,23 +9678,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 441 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 443 + "__id__": 452 }, { - "__id__": 445 + "__id__": 454 }, { - "__id__": 447 + "__id__": 456 } ], "_prefab": { - "__id__": 449 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -9617,11 +9731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 444 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -9645,11 +9759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9690,11 +9804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 457 }, "_alignFlags": 45, "_target": null, @@ -9739,23 +9853,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 441 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 451 + "__id__": 460 }, { - "__id__": 453 + "__id__": 462 }, { - "__id__": 455 + "__id__": 464 } ], "_prefab": { - "__id__": 457 + "__id__": 466 }, "_lpos": { "__type__": "cc.Vec3", @@ -9792,11 +9906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 461 }, "_contentSize": { "__type__": "cc.Size", @@ -9820,11 +9934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 454 + "__id__": 463 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9865,11 +9979,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 456 + "__id__": 465 }, "_alignFlags": 45, "_target": null, @@ -9914,23 +10028,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 441 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 459 + "__id__": 468 }, { - "__id__": 461 + "__id__": 470 }, { - "__id__": 463 + "__id__": 472 } ], "_prefab": { - "__id__": 465 + "__id__": 474 }, "_lpos": { "__type__": "cc.Vec3", @@ -9967,11 +10081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 467 }, "_enabled": true, "__prefab": { - "__id__": 460 + "__id__": 469 }, "_contentSize": { "__type__": "cc.Size", @@ -9995,11 +10109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 467 }, "_enabled": true, "__prefab": { - "__id__": 462 + "__id__": 471 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10040,11 +10154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 467 }, "_enabled": true, "__prefab": { - "__id__": 464 + "__id__": 473 }, "_alignFlags": 45, "_target": null, @@ -10089,11 +10203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 476 }, "_contentSize": { "__type__": "cc.Size", @@ -10130,11 +10244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 360 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 479 }, "_contentSize": { "__type__": "cc.Size", @@ -10158,11 +10272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 360 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 481 }, "_alignFlags": 45, "_target": null, @@ -10211,7 +10325,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 484 }, "_alignFlags": 41, "_target": null, @@ -10249,18 +10363,18 @@ "instance": null, "targetOverrides": [ { - "__id__": 477 + "__id__": 486 }, { - "__id__": 479 + "__id__": 488 }, { - "__id__": 481 + "__id__": 490 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 278 + "__id__": 287 }, { "__id__": 47 @@ -10273,7 +10387,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 318 + "__id__": 327 }, "sourceInfo": null, "propertyPath": [ @@ -10283,7 +10397,7 @@ "__id__": 47 }, "targetInfo": { - "__id__": 478 + "__id__": 487 } }, { @@ -10295,7 +10409,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 318 + "__id__": 327 }, "sourceInfo": null, "propertyPath": [ @@ -10305,7 +10419,7 @@ "__id__": 47 }, "targetInfo": { - "__id__": 480 + "__id__": 489 } }, { @@ -10317,7 +10431,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 318 + "__id__": 327 }, "sourceInfo": null, "propertyPath": [ @@ -10327,7 +10441,7 @@ "__id__": 47 }, "targetInfo": { - "__id__": 482 + "__id__": 491 } }, { diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts index cbf3d2c7..047286af 100644 --- a/assets/script/game/common/config/HeroSkillDesc.ts +++ b/assets/script/game/common/config/HeroSkillDesc.ts @@ -197,13 +197,16 @@ function buildEffectLine(head: string, skill: SkillConfig): ISkillLine { * * Why: FieldSkillConfig.info 是手写文案，改 value 易漂移。这里以 FieldSkillType * 为 key 查标准动词，数值按 fmt（比例/整数/减免）从 value 实时渲染。 + * + * @param showName 是否在行中包含「技能名」片段（英雄面板需要，装备商店不需要） */ -function buildFieldLine(head: string, uuid: number): ISkillLine | null { +function buildFieldLine(head: string, uuid: number, showName: boolean = true): ISkillLine | null { const fs = FieldSkillSet[uuid]; if (!fs) return null; const desc = FieldDescSet[fs.type]; + const nameSeg = showName ? `「${fs.name}」 ` : ""; // 未入表类型回退基础备注 info，整行不高亮 - if (!desc) return { prefix: `${head}「${fs.name}」 ${fs.info}`, value: "", suffix: "" }; + if (!desc) return { prefix: `${head}${nameSeg}${fs.info}`, value: "", suffix: "" }; // 数值按格式渲染为高亮片段 let valueText: string; @@ -219,7 +222,7 @@ function buildFieldLine(head: string, uuid: number): ISkillLine | null { valueText = `+${fs.value}`; break; } - return { prefix: `${head}「${fs.name}」 ${desc.verb}`, value: valueText, suffix: "" }; + return { prefix: `${head}${nameSeg}${desc.verb}`, value: valueText, suffix: "" }; } /** @@ -291,7 +294,7 @@ function buildSkillLines(source: ISkillDescSource): ISkillLine[] { if (fieldUuids?.length) { const tpl = SkillTriggerName[SkillTriggerType.Field] ?? "光环"; for (const uuid of fieldUuids) { - const line = buildFieldLine(`${tpl}:`, uuid); + const line = buildFieldLine(`${tpl}:`, uuid, true); if (line) lines.push(line); } } @@ -362,15 +365,16 @@ export function buildSingleSkillRich(skillUuid: number, overrides?: SkillOverrid } /** - * 装备详情富文本（IBox 弹窗用）：展示装备包含的全部驻场光环词条。 + * 装备/驻场光环详情富文本：展示全部词条，数值绿色高亮。 * @param fieldUuids FieldSkillSet 驻场光环 UUID 数组 + * @param showName 是否包含「技能名」片段（英雄面板 true，装备商店 false） * @returns 多行富文本串，每行一个词条 */ -export function buildEquipRich(fieldUuids: number[]): string { +export function buildEquipRich(fieldUuids: number[], showName: boolean = false): string { if (!fieldUuids?.length) return "无词条"; const lines: string[] = []; for (const uuid of fieldUuids) { - const line = buildFieldLine("", uuid); + const line = buildFieldLine("", uuid, showName); if (!line) continue; const prefix = line.prefix.replace(SKILL_NAME_PATTERN, `「$1」`); const text = line.value diff --git a/assets/script/game/map/CHeroComp.ts b/assets/script/game/map/CHeroComp.ts index 81cb47e7..1098287c 100644 --- a/assets/script/game/map/CHeroComp.ts +++ b/assets/script/game/map/CHeroComp.ts @@ -16,11 +16,12 @@ * - 英雄卡效果事件为 GameEvent.CallHero，而非 UseSkillCard。 */ import { mLogger } from "../common/Logger"; -import { _decorator, Node, Sprite, Label, NodeEventType, Vec3, Tween, tween, UIOpacity, SpriteFrame, resources, AnimationClip } from "cc"; +import { _decorator, Node, Sprite, Label, RichText, NodeEventType, Vec3, Tween, tween, UIOpacity, SpriteFrame, resources, AnimationClip } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { CardConfig, CardType } from "../common/config/CardSet"; import { HeroInfo } from "../common/config/heroSet"; +import { buildSkillDescRich } from "../common/config/HeroSkillDesc"; import { oops } from "db://oops-framework/core/Oops"; import { GameEvent } from "../common/config/GameEvent"; import { smc } from "../common/SingletonModuleComp"; @@ -66,6 +67,10 @@ export class CHeroComp extends CCComp { @property(Label) private fied3: Label = null; + /** 描述富文本（多行，数值绿色高亮、技能名蓝色，由 buildSkillDescRich 生成） */ + @property(RichText) + private info_rich: RichText = null; + /** 等级标签 */ @property(Label) private level_label: Label = null; @@ -213,12 +218,9 @@ export class CHeroComp extends CCComp { this.node.setScale(1, 1, 1); if (this.name_label) this.name_label.string = ""; if (this.level_label) this.level_label.string = ""; - const fieldLabels = [this.fied1, this.fied2, this.fied3]; - for (const label of fieldLabels) { - if (label) { - label.string = ""; - label.node.active = false; - } + if (this.info_rich) { + this.info_rich.string = ""; + this.info_rich.node.active = false; } if (this.icon_node) { const sprite = this.icon_node.getComponent(Sprite) || this.icon_node.getComponentInChildren(Sprite); @@ -286,13 +288,11 @@ export class CHeroComp extends CCComp { // 背景：按 card_lv 激活对应颜色子节点（1→green 2→blue 3→purple 4→red 5→yellow） this.updateBgNode(); - // 描述词条（最多显示 3 条，对应 fied1/fied2/fied3） - const fieldLabels = [this.fied1, this.fied2, this.fied3]; - const desc = hero?.info || this.cardData.info || ""; - for (let i = 0; i < fieldLabels.length; i++) { - if (!fieldLabels[i]) continue; - fieldLabels[i].string = i === 0 ? desc : ""; - fieldLabels[i].node.active = i === 0 && !!desc; + // 描述富文本（英雄触发技能，数值随等级配置高亮） + if (this.info_rich) { + const desc = hero ? buildSkillDescRich(hero) : (this.cardData.info || ""); + this.info_rich.string = desc; + this.info_rich.node.active = !!desc; } // 图标 diff --git a/assets/script/game/map/EquipListComp.ts b/assets/script/game/map/EquipListComp.ts index f256a8af..280669e3 100644 --- a/assets/script/game/map/EquipListComp.ts +++ b/assets/script/game/map/EquipListComp.ts @@ -12,12 +12,12 @@ * EquipBoxComp 按 Field 类型被动驻场，属性加成由 FieldSkillHelper 全局聚合。 */ import { mLogger } from "../common/Logger"; -import { _decorator, Node, Label, NodeEventType, Vec3, UIOpacity, tween, Tween } from "cc"; +import { _decorator, Node, Label, RichText, NodeEventType, Vec3, UIOpacity, tween, Tween } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { CardConfig } from "../common/config/CardSet"; import { EquipPoolList } from "../common/config/EquipSet"; -import { FieldSkillSet } from "../common/config/SkillSet"; +import { buildEquipRich } from "../common/config/HeroSkillDesc"; import { oops } from "db://oops-framework/core/Oops"; import { getCardIconId, setSpriteFrame } from "../common/CardIconHelper"; import { GameEvent } from "../common/config/GameEvent"; @@ -50,15 +50,9 @@ export class EquipListComp extends CCComp { @property(Label) private name_label: Label = null; - /** 属性词条 1 */ - @property(Label) - private fied1: Label = null; - /** 属性词条 2 */ - @property(Label) - private fied2: Label = null; - /** 属性词条 3 */ - @property(Label) - private fied3: Label = null; + /** 属性词条富文本（多行，数值绿色高亮，由 buildEquipRich 按 FieldDescSet 实时渲染） */ + @property(RichText) + private info_rich: RichText = null; /** 等级标签 */ @property(Label) @@ -161,19 +155,11 @@ export class EquipListComp extends CCComp { // 背景：按 card_lv 激活对应颜色子节点（1→green 2→blue 3→purple 4→red 5→yellow） this.updateBgNode(); - // 属性词条（最多显示 3 条，对应 fied1/fied2/fied3） - const fieldLabels = [this.fied1, this.fied2, this.fied3]; - const fields = this.cardData.field || []; - for (let i = 0; i < fieldLabels.length; i++) { - if (!fieldLabels[i]) continue; - if (i < fields.length) { - const fieldConfig = FieldSkillSet[fields[i]]; - fieldLabels[i].string = fieldConfig?.info || ""; - fieldLabels[i].node.active = true; - } else { - fieldLabels[i].string = ""; - fieldLabels[i].node.active = false; - } + // 属性词条富文本（多词条装备由 buildEquipRich 按 \n 多行渲染，数值实时高亮） + if (this.info_rich) { + const desc = buildEquipRich(this.cardData.field || []); + this.info_rich.string = desc; + this.info_rich.node.active = !!desc; } // 图标（共享工具解析：cardData.icon → FieldSkillSet → SkillSet）