From a06c2c0e31afeddc30093755ed5a0629ef7c5339 Mon Sep 17 00:00:00 2001 From: pan Date: Fri, 31 Jul 2026 16:02:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E5=8D=A1=E7=89=8C?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=B8=B2=E6=9F=93=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8A=A8=E6=80=81=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增SkillDescSet配置商店技能与药水模板，补充6201-6206范围攻击与6502-6511计时强化技能配置 2. 替换原有单/多文本标签为富文本组件，统一使用buildCardDescRich生成描述 3. 简化物品商店与卡牌组件的描述渲染逻辑，移除冗余的getDescription方法 4. 为药水卡片移除硬编码描述，改为从技能模板动态生成，自动高亮数值与持续时间 5. 实现附加概率后缀自动生成，支持暴击/冰冻/击晕/击退概率动态展示 --- assets/resources/gui/element/cItem.prefab | 1146 +++++++++-------- assets/resources/gui/element/cSkill.prefab | 1128 +++++++++------- .../game/common/config/HeroSkillDesc.ts | 93 ++ assets/script/game/common/config/ICardSet.ts | 28 +- .../script/game/common/config/SkillDescSet.ts | 80 ++ assets/script/game/map/ItemListComp.ts | 62 +- assets/script/game/map/SCardComp.ts | 47 +- 7 files changed, 1480 insertions(+), 1104 deletions(-) diff --git a/assets/resources/gui/element/cItem.prefab b/assets/resources/gui/element/cItem.prefab index 2eaf788f..2934897d 100644 --- a/assets/resources/gui/element/cItem.prefab +++ b/assets/resources/gui/element/cItem.prefab @@ -32,22 +32,25 @@ }, { "__id__": 134 + }, + { + "__id__": 140 } ], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 173 }, { - "__id__": 169 + "__id__": 175 }, { - "__id__": 171 + "__id__": 177 } ], "_prefab": { - "__id__": 377 + "__id__": 383 }, "_lpos": { "__type__": "cc.Vec3", @@ -1553,7 +1556,7 @@ "__id__": 119 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 127 @@ -2306,6 +2309,135 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "RichText", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 135 + }, + { + "__id__": 137 + } + ], + "_prefab": { + "__id__": 139 + }, + "_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__": 134 + }, + "_enabled": true, + "__prefab": { + "__id__": 136 + }, + "_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": "dbWcp8yUNEPpHHvqD9Uqm+" + }, + { + "__type__": "cc.RichText", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 134 + }, + "_enabled": true, + "__prefab": { + "__id__": 138 + }, + "_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": "f2cJCJSeVC1aT4BEXGmj6q" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c2BogmpbpLgIEl3F8ScVWV", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -2313,14 +2445,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 135 + "__id__": 141 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 134 + "__id__": 140 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2328,7 +2460,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 136 + "__id__": 142 }, "targetOverrides": null }, @@ -2341,31 +2473,22 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 137 + "__id__": 143 } ], "propertyOverrides": [ { - "__id__": 141 + "__id__": 147 }, { - "__id__": 143 - }, - { - "__id__": 144 - }, - { - "__id__": 145 - }, - { - "__id__": 146 - }, - { - "__id__": 148 + "__id__": 149 }, { "__id__": 150 }, + { + "__id__": 151 + }, { "__id__": 152 }, @@ -2379,16 +2502,25 @@ "__id__": 158 }, { - "__id__": 159 + "__id__": 160 }, { - "__id__": 161 + "__id__": 162 }, { - "__id__": 163 + "__id__": 164 }, { "__id__": 165 + }, + { + "__id__": 167 + }, + { + "__id__": 169 + }, + { + "__id__": 171 } ], "removedComponents": [] @@ -2396,11 +2528,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 138 + "__id__": 144 }, "components": [ { - "__id__": 139 + "__id__": 145 } ] }, @@ -2416,15 +2548,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 134 + "__id__": 140 } }, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 146 }, "_alignFlags": 4, "_target": null, @@ -2453,7 +2585,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_name" @@ -2469,7 +2601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_lpos" @@ -2484,7 +2616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_lrot" @@ -2500,7 +2632,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_euler" @@ -2515,7 +2647,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 153 }, "propertyPath": [ "_contentSize" @@ -2535,7 +2667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 155 }, "propertyPath": [ "_contentSize" @@ -2555,7 +2687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 157 }, "propertyPath": [ "_contentSize" @@ -2575,7 +2707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 153 + "__id__": 159 }, "propertyPath": [ "_lpos" @@ -2596,7 +2728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 155 + "__id__": 161 }, "propertyPath": [ "_contentSize" @@ -2616,7 +2748,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 163 }, "propertyPath": [ "_top" @@ -2632,7 +2764,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 157 + "__id__": 163 }, "propertyPath": [ "_bottom" @@ -2642,7 +2774,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 166 }, "propertyPath": [ "_active" @@ -2658,7 +2790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 168 }, "propertyPath": [ "_lpos" @@ -2679,7 +2811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 164 + "__id__": 170 }, "propertyPath": [ "_color" @@ -2701,7 +2833,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 172 }, "propertyPath": [ "_color" @@ -2730,7 +2862,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 174 }, "_contentSize": { "__type__": "cc.Size", @@ -2758,7 +2890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 176 }, "_alignFlags": 40, "_target": null, @@ -2794,34 +2926,28 @@ }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 178 }, "icon_node": { - "__id__": 173 + "__id__": 179 }, "bg_node": { - "__id__": 213 + "__id__": 219 }, "name_label": { "__id__": 24 }, - "fied1": { - "__id__": 106 - }, - "fied2": { - "__id__": 114 - }, - "fied3": { - "__id__": 122 + "info_rich": { + "__id__": 137 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 134 + "__id__": 140 }, "cost_label": { - "__id__": 327 + "__id__": 333 }, "_id": "" }, @@ -2835,20 +2961,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 214 }, { - "__id__": 210 + "__id__": 216 } ], "_prefab": { - "__id__": 212 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -2888,39 +3014,39 @@ "__id__": 40 }, "_children": [ - { - "__id__": 175 - }, - { - "__id__": 173 - }, { "__id__": 181 }, + { + "__id__": 179 + }, { "__id__": 187 }, { "__id__": 193 + }, + { + "__id__": 199 } ], "_active": true, "_components": [ - { - "__id__": 199 - }, - { - "__id__": 201 - }, - { - "__id__": 203 - }, { "__id__": 205 + }, + { + "__id__": 207 + }, + { + "__id__": 209 + }, + { + "__id__": 211 } ], "_prefab": { - "__id__": 207 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -2957,20 +3083,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [], "_active": true, "_components": [ { - "__id__": 176 + "__id__": 182 }, { - "__id__": 178 + "__id__": 184 } ], "_prefab": { - "__id__": 180 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -3007,11 +3133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -3035,11 +3161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3093,143 +3219,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 182 - }, - { - "__id__": 184 - } - ], - "_prefab": { - "__id__": 186 - }, - "_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__": 181 - }, - "_enabled": true, - "__prefab": { - "__id__": 183 - }, - "_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__": 181 - }, - "_enabled": true, - "__prefab": { - "__id__": 185 - }, - "_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__": 174 + "__id__": 180 }, "_children": [], "_active": false, @@ -3299,7 +3289,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23LtSLPpxPLbmAJs09fdIw" + "fileId": "acwGVgSsdCUIEmlLZVMZbN" }, { "__type__": "cc.Sprite", @@ -3344,7 +3334,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dzgwgV3tNZJEoewp8KY38" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -3354,18 +3344,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__": 174 + "__id__": 180 }, "_children": [], "_active": false, @@ -3435,7 +3425,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8GRaxM2BNv76iifo8Ck5A" + "fileId": "23LtSLPpxPLbmAJs09fdIw" }, { "__type__": "cc.Sprite", @@ -3478,6 +3468,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__": 180 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 200 + }, + { + "__id__": 202 + } + ], + "_prefab": { + "__id__": 204 + }, + "_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__": 199 + }, + "_enabled": true, + "__prefab": { + "__id__": 201 + }, + "_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__": 199 + }, + "_enabled": true, + "__prefab": { + "__id__": 203 + }, + "_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" @@ -3501,11 +3627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -3529,11 +3655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 208 }, "_type": 0, "_inverted": false, @@ -3551,11 +3677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 210 }, "_alignFlags": 45, "_target": null, @@ -3587,11 +3713,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3646,11 +3772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -3674,11 +3800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3736,35 +3862,35 @@ }, "_children": [ { - "__id__": 214 + "__id__": 220 }, { - "__id__": 230 + "__id__": 236 }, { - "__id__": 246 + "__id__": 252 }, { - "__id__": 262 + "__id__": 268 }, { - "__id__": 278 + "__id__": 284 }, { - "__id__": 294 + "__id__": 300 } ], "_active": true, "_components": [ { - "__id__": 322 + "__id__": 328 }, { - "__id__": 324 + "__id__": 330 } ], "_prefab": { - "__id__": 326 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -3801,27 +3927,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 215 + "__id__": 221 } ], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 229 }, { - "__id__": 225 + "__id__": 231 }, { - "__id__": 227 + "__id__": 233 } ], "_prefab": { - "__id__": 229 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -3858,23 +3984,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 222 }, { - "__id__": 218 + "__id__": 224 }, { - "__id__": 220 + "__id__": 226 } ], "_prefab": { - "__id__": 222 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -3911,11 +4037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -3939,11 +4065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3987,11 +4113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 227 }, "_alignFlags": 45, "_target": null, @@ -4036,11 +4162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4064,11 +4190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4112,11 +4238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 234 }, "_alignFlags": 45, "_target": null, @@ -4161,27 +4287,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 231 + "__id__": 237 } ], "_active": false, "_components": [ { - "__id__": 239 + "__id__": 245 }, { - "__id__": 241 + "__id__": 247 }, { - "__id__": 243 + "__id__": 249 } ], "_prefab": { - "__id__": 245 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -4218,23 +4344,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 230 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 238 }, { - "__id__": 234 + "__id__": 240 }, { - "__id__": 236 + "__id__": 242 } ], "_prefab": { - "__id__": 238 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -4271,11 +4397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -4299,11 +4425,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4344,11 +4470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 243 }, "_alignFlags": 45, "_target": null, @@ -4393,11 +4519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -4421,11 +4547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4469,11 +4595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 250 }, "_alignFlags": 45, "_target": null, @@ -4518,27 +4644,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 247 + "__id__": 253 } ], "_active": false, "_components": [ { - "__id__": 255 + "__id__": 261 }, { - "__id__": 257 + "__id__": 263 }, { - "__id__": 259 + "__id__": 265 } ], "_prefab": { - "__id__": 261 + "__id__": 267 }, "_lpos": { "__type__": "cc.Vec3", @@ -4575,23 +4701,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 246 + "__id__": 252 }, "_children": [], "_active": true, "_components": [ { - "__id__": 248 + "__id__": 254 }, { - "__id__": 250 + "__id__": 256 }, { - "__id__": 252 + "__id__": 258 } ], "_prefab": { - "__id__": 254 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -4628,11 +4754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -4656,11 +4782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 257 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4704,11 +4830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 259 }, "_alignFlags": 45, "_target": null, @@ -4753,11 +4879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -4781,11 +4907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4829,11 +4955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 252 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 266 }, "_alignFlags": 45, "_target": null, @@ -4878,27 +5004,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 263 + "__id__": 269 } ], "_active": false, "_components": [ { - "__id__": 271 + "__id__": 277 }, { - "__id__": 273 + "__id__": 279 }, { - "__id__": 275 + "__id__": 281 } ], "_prefab": { - "__id__": 277 + "__id__": 283 }, "_lpos": { "__type__": "cc.Vec3", @@ -4935,23 +5061,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 268 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 270 }, { - "__id__": 266 + "__id__": 272 }, { - "__id__": 268 + "__id__": 274 } ], "_prefab": { - "__id__": 270 + "__id__": 276 }, "_lpos": { "__type__": "cc.Vec3", @@ -4988,11 +5114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -5016,11 +5142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5064,11 +5190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 275 }, "_alignFlags": 45, "_target": null, @@ -5113,11 +5239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 278 }, "_contentSize": { "__type__": "cc.Size", @@ -5141,11 +5267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 280 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5189,11 +5315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 282 }, "_alignFlags": 45, "_target": null, @@ -5238,27 +5364,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 279 + "__id__": 285 } ], "_active": false, "_components": [ { - "__id__": 287 + "__id__": 293 }, { - "__id__": 289 + "__id__": 295 }, { - "__id__": 291 + "__id__": 297 } ], "_prefab": { - "__id__": 293 + "__id__": 299 }, "_lpos": { "__type__": "cc.Vec3", @@ -5295,23 +5421,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 284 }, "_children": [], "_active": true, "_components": [ { - "__id__": 280 + "__id__": 286 }, { - "__id__": 282 + "__id__": 288 }, { - "__id__": 284 + "__id__": 290 } ], "_prefab": { - "__id__": 286 + "__id__": 292 }, "_lpos": { "__type__": "cc.Vec3", @@ -5348,11 +5474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -5376,11 +5502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5424,11 +5550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 291 }, "_alignFlags": 45, "_target": null, @@ -5473,11 +5599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -5501,11 +5627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 296 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5549,11 +5675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 298 }, "_alignFlags": 45, "_target": null, @@ -5598,27 +5724,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 213 + "__id__": 219 }, "_children": [ { - "__id__": 295 + "__id__": 301 }, { - "__id__": 303 + "__id__": 309 }, { - "__id__": 311 + "__id__": 317 } ], "_active": false, "_components": [ { - "__id__": 319 + "__id__": 325 } ], "_prefab": { - "__id__": 321 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -5655,23 +5781,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 294 + "__id__": 300 }, "_children": [], "_active": false, "_components": [ { - "__id__": 296 + "__id__": 302 }, { - "__id__": 298 + "__id__": 304 }, { - "__id__": 300 + "__id__": 306 } ], "_prefab": { - "__id__": 302 + "__id__": 308 }, "_lpos": { "__type__": "cc.Vec3", @@ -5708,11 +5834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 303 }, "_contentSize": { "__type__": "cc.Size", @@ -5736,11 +5862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 305 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5781,11 +5907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 307 }, "_alignFlags": 45, "_target": null, @@ -5830,23 +5956,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 294 + "__id__": 300 }, "_children": [], "_active": false, "_components": [ { - "__id__": 304 + "__id__": 310 }, { - "__id__": 306 + "__id__": 312 }, { - "__id__": 308 + "__id__": 314 } ], "_prefab": { - "__id__": 310 + "__id__": 316 }, "_lpos": { "__type__": "cc.Vec3", @@ -5883,11 +6009,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 311 }, "_contentSize": { "__type__": "cc.Size", @@ -5911,11 +6037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 313 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5956,11 +6082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 309 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 315 }, "_alignFlags": 45, "_target": null, @@ -6005,23 +6131,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 294 + "__id__": 300 }, "_children": [], "_active": false, "_components": [ { - "__id__": 312 + "__id__": 318 }, { - "__id__": 314 + "__id__": 320 }, { - "__id__": 316 + "__id__": 322 } ], "_prefab": { - "__id__": 318 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -6058,11 +6184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 311 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -6086,11 +6212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 311 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 321 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6131,11 +6257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 311 + "__id__": 317 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 323 }, "_alignFlags": 45, "_target": null, @@ -6180,11 +6306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -6221,11 +6347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -6249,11 +6375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 331 }, "_alignFlags": 45, "_target": null, @@ -6298,11 +6424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6362,20 +6488,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 329 + "__id__": 335 }, "_children": [], "_active": true, "_components": [ { - "__id__": 373 + "__id__": 379 }, { - "__id__": 327 + "__id__": 333 } ], "_prefab": { - "__id__": 375 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -6414,27 +6540,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 330 + "__id__": 336 }, "_children": [ { - "__id__": 362 + "__id__": 368 }, { - "__id__": 328 + "__id__": 334 } ], "_active": true, "_components": [ { - "__id__": 368 + "__id__": 374 }, { - "__id__": 370 + "__id__": 376 } ], "_prefab": { - "__id__": 372 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", @@ -6471,33 +6597,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 140 }, "_children": [ - { - "__id__": 331 - }, - { - "__id__": 329 - }, { "__id__": 337 + }, + { + "__id__": 335 + }, + { + "__id__": 343 } ], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 361 }, { - "__id__": 357 + "__id__": 363 }, { - "__id__": 359 + "__id__": 365 } ], "_prefab": { - "__id__": 361 + "__id__": 367 }, "_lpos": { "__type__": "cc.Vec3", @@ -6536,20 +6662,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 330 + "__id__": 336 }, "_children": [], "_active": false, "_components": [ { - "__id__": 332 + "__id__": 338 }, { - "__id__": 334 + "__id__": 340 } ], "_prefab": { - "__id__": 336 + "__id__": 342 }, "_lpos": { "__type__": "cc.Vec3", @@ -6586,11 +6712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -6614,11 +6740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6697,27 +6823,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 330 + "__id__": 336 }, "_children": [ { - "__id__": 338 + "__id__": 344 }, { - "__id__": 344 + "__id__": 350 } ], "_active": false, "_components": [ { - "__id__": 350 + "__id__": 356 }, { - "__id__": 352 + "__id__": 358 } ], "_prefab": { - "__id__": 354 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -6754,20 +6880,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 343 }, "_children": [], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 345 }, { - "__id__": 341 + "__id__": 347 } ], "_prefab": { - "__id__": 343 + "__id__": 349 }, "_lpos": { "__type__": "cc.Vec3", @@ -6804,11 +6930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 346 }, "_contentSize": { "__type__": "cc.Size", @@ -6832,11 +6958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 348 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6893,20 +7019,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 343 }, "_children": [], "_active": true, "_components": [ { - "__id__": 345 + "__id__": 351 }, { - "__id__": 347 + "__id__": 353 } ], "_prefab": { - "__id__": 349 + "__id__": 355 }, "_lpos": { "__type__": "cc.Vec3", @@ -6943,11 +7069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 352 }, "_contentSize": { "__type__": "cc.Size", @@ -6971,11 +7097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 354 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7052,11 +7178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -7080,11 +7206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 359 }, "_resizeMode": 1, "_layoutType": 1, @@ -7131,11 +7257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7159,11 +7285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 364 }, "_alignFlags": 45, "_target": null, @@ -7195,11 +7321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 366 }, "_resizeMode": 1, "_layoutType": 2, @@ -7246,20 +7372,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 329 + "__id__": 335 }, "_children": [], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 369 }, { - "__id__": 365 + "__id__": 371 } ], "_prefab": { - "__id__": 367 + "__id__": 373 }, "_lpos": { "__type__": "cc.Vec3", @@ -7296,11 +7422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -7324,11 +7450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 368 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 372 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7382,11 +7508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -7410,11 +7536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 377 }, "_resizeMode": 1, "_layoutType": 1, @@ -7461,11 +7587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 328 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 380 }, "_contentSize": { "__type__": "cc.Size", @@ -7511,22 +7637,22 @@ "fileId": "5dVotvOAFMoaprbNZVAkgY", "instance": null, "targetOverrides": [ - { - "__id__": 378 - }, - { - "__id__": 380 - }, - { - "__id__": 382 - }, { "__id__": 384 + }, + { + "__id__": 386 + }, + { + "__id__": 388 + }, + { + "__id__": 390 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 134 + "__id__": 140 }, { "__id__": 40 @@ -7539,7 +7665,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 171 + "__id__": 177 }, "sourceInfo": null, "propertyPath": [ @@ -7549,7 +7675,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 379 + "__id__": 385 } }, { @@ -7561,7 +7687,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 171 + "__id__": 177 }, "sourceInfo": null, "propertyPath": [ @@ -7571,7 +7697,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 381 + "__id__": 387 } }, { @@ -7583,17 +7709,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 171 + "__id__": 177 }, "sourceInfo": null, "propertyPath": [ "cost_label" ], "target": { - "__id__": 134 + "__id__": 140 }, "targetInfo": { - "__id__": 383 + "__id__": 389 } }, { @@ -7605,15 +7731,15 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 139 + "__id__": 145 }, "sourceInfo": null, "propertyPath": [], "target": { - "__id__": 134 + "__id__": 140 }, "targetInfo": { - "__id__": 385 + "__id__": 391 } }, { diff --git a/assets/resources/gui/element/cSkill.prefab b/assets/resources/gui/element/cSkill.prefab index 413fbe95..5da068df 100644 --- a/assets/resources/gui/element/cSkill.prefab +++ b/assets/resources/gui/element/cSkill.prefab @@ -32,22 +32,25 @@ }, { "__id__": 119 + }, + { + "__id__": 125 } ], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 158 }, { - "__id__": 154 + "__id__": 160 }, { - "__id__": 156 + "__id__": 162 } ], "_prefab": { - "__id__": 362 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -1373,7 +1376,7 @@ "__id__": 104 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 112 @@ -2126,6 +2129,135 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "RichText", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 120 + }, + { + "__id__": 122 + } + ], + "_prefab": { + "__id__": 124 + }, + "_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__": 119 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 190, + "height": 26.46 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6btho4AA9AsrlKMBsge7fI" + }, + { + "__type__": "cc.RichText", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 119 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_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": "f6TG/pLEJAl5sSeDDNFtAE" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbpdlDp/FEmpA5bo0PzTE1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -2133,14 +2265,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 120 + "__id__": 126 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 119 + "__id__": 125 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2148,7 +2280,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 121 + "__id__": 127 }, "targetOverrides": null }, @@ -2161,31 +2293,22 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 122 + "__id__": 128 } ], "propertyOverrides": [ { - "__id__": 126 + "__id__": 132 }, { - "__id__": 128 - }, - { - "__id__": 129 - }, - { - "__id__": 130 - }, - { - "__id__": 131 - }, - { - "__id__": 133 + "__id__": 134 }, { "__id__": 135 }, + { + "__id__": 136 + }, { "__id__": 137 }, @@ -2199,16 +2322,25 @@ "__id__": 143 }, { - "__id__": 144 + "__id__": 145 }, { - "__id__": 146 + "__id__": 147 }, { - "__id__": 148 + "__id__": 149 }, { "__id__": 150 + }, + { + "__id__": 152 + }, + { + "__id__": 154 + }, + { + "__id__": 156 } ], "removedComponents": [] @@ -2216,11 +2348,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 123 + "__id__": 129 }, "components": [ { - "__id__": 124 + "__id__": 130 } ] }, @@ -2236,15 +2368,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 119 + "__id__": 125 } }, "node": { - "__id__": 119 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 131 }, "_alignFlags": 4, "_target": null, @@ -2273,7 +2405,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 127 + "__id__": 133 }, "propertyPath": [ "_name" @@ -2289,7 +2421,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 127 + "__id__": 133 }, "propertyPath": [ "_lpos" @@ -2304,7 +2436,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 127 + "__id__": 133 }, "propertyPath": [ "_lrot" @@ -2320,7 +2452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 127 + "__id__": 133 }, "propertyPath": [ "_euler" @@ -2335,7 +2467,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 132 + "__id__": 138 }, "propertyPath": [ "_contentSize" @@ -2355,7 +2487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 134 + "__id__": 140 }, "propertyPath": [ "_contentSize" @@ -2375,7 +2507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 136 + "__id__": 142 }, "propertyPath": [ "_contentSize" @@ -2395,7 +2527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 138 + "__id__": 144 }, "propertyPath": [ "_lpos" @@ -2416,7 +2548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 140 + "__id__": 146 }, "propertyPath": [ "_contentSize" @@ -2436,7 +2568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_top" @@ -2452,7 +2584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 142 + "__id__": 148 }, "propertyPath": [ "_bottom" @@ -2462,7 +2594,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 + "__id__": 151 }, "propertyPath": [ "_active" @@ -2478,7 +2610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 153 }, "propertyPath": [ "_lpos" @@ -2499,7 +2631,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 155 }, "propertyPath": [ "_color" @@ -2521,7 +2653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 157 }, "propertyPath": [ "_color" @@ -2550,7 +2682,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -2578,7 +2710,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 161 }, "_alignFlags": 40, "_target": null, @@ -2614,34 +2746,28 @@ }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 163 }, "icon_node": { - "__id__": 158 + "__id__": 164 }, "bg_node": { - "__id__": 198 + "__id__": 204 }, "name_label": { "__id__": 24 }, - "fied1": { - "__id__": 91 - }, - "fied2": { - "__id__": 99 - }, - "fied3": { - "__id__": 107 + "info_rich": { + "__id__": 122 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 119 + "__id__": 125 }, "cost_label": { - "__id__": 312 + "__id__": 318 }, "_id": "" }, @@ -2655,20 +2781,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 165 }, "_children": [], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 199 }, { - "__id__": 195 + "__id__": 201 } ], "_prefab": { - "__id__": 197 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -2708,39 +2834,39 @@ "__id__": 40 }, "_children": [ - { - "__id__": 160 - }, - { - "__id__": 158 - }, { "__id__": 166 }, + { + "__id__": 164 + }, { "__id__": 172 }, { "__id__": 178 + }, + { + "__id__": 184 } ], "_active": true, "_components": [ - { - "__id__": 184 - }, - { - "__id__": 186 - }, - { - "__id__": 188 - }, { "__id__": 190 + }, + { + "__id__": 192 + }, + { + "__id__": 194 + }, + { + "__id__": 196 } ], "_prefab": { - "__id__": 192 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -2777,20 +2903,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 + "__id__": 165 }, "_children": [], "_active": true, "_components": [ { - "__id__": 161 + "__id__": 167 }, { - "__id__": 163 + "__id__": 169 } ], "_prefab": { - "__id__": 165 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -2827,11 +2953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 168 }, "_contentSize": { "__type__": "cc.Size", @@ -2855,11 +2981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 170 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2913,143 +3039,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 159 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 167 - }, - { - "__id__": 169 - } - ], - "_prefab": { - "__id__": 171 - }, - "_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__": 166 - }, - "_enabled": true, - "__prefab": { - "__id__": 168 - }, - "_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__": 166 - }, - "_enabled": true, - "__prefab": { - "__id__": 170 - }, - "_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__": 159 + "__id__": 165 }, "_children": [], "_active": false, @@ -3119,7 +3109,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23LtSLPpxPLbmAJs09fdIw" + "fileId": "acwGVgSsdCUIEmlLZVMZbN" }, { "__type__": "cc.Sprite", @@ -3164,7 +3154,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dzgwgV3tNZJEoewp8KY38" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -3174,18 +3164,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__": 159 + "__id__": 165 }, "_children": [], "_active": false, @@ -3255,7 +3245,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c8GRaxM2BNv76iifo8Ck5A" + "fileId": "23LtSLPpxPLbmAJs09fdIw" }, { "__type__": "cc.Sprite", @@ -3298,6 +3288,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__": 165 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 185 + }, + { + "__id__": 187 + } + ], + "_prefab": { + "__id__": 189 + }, + "_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__": 184 + }, + "_enabled": true, + "__prefab": { + "__id__": 186 + }, + "_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__": 184 + }, + "_enabled": true, + "__prefab": { + "__id__": 188 + }, + "_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" @@ -3321,11 +3447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -3349,11 +3475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 193 }, "_type": 0, "_inverted": false, @@ -3371,11 +3497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 195 }, "_alignFlags": 45, "_target": null, @@ -3407,11 +3533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3466,11 +3592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -3494,11 +3620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3556,35 +3682,35 @@ }, "_children": [ { - "__id__": 199 + "__id__": 205 }, { - "__id__": 215 + "__id__": 221 }, { - "__id__": 231 + "__id__": 237 }, { - "__id__": 247 + "__id__": 253 }, { - "__id__": 263 + "__id__": 269 }, { - "__id__": 279 + "__id__": 285 } ], "_active": true, "_components": [ { - "__id__": 307 + "__id__": 313 }, { - "__id__": 309 + "__id__": 315 } ], "_prefab": { - "__id__": 311 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -3621,27 +3747,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 200 + "__id__": 206 } ], "_active": false, "_components": [ { - "__id__": 208 + "__id__": 214 }, { - "__id__": 210 + "__id__": 216 }, { - "__id__": 212 + "__id__": 218 } ], "_prefab": { - "__id__": 214 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -3678,23 +3804,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 199 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 201 + "__id__": 207 }, { - "__id__": 203 + "__id__": 209 }, { - "__id__": 205 + "__id__": 211 } ], "_prefab": { - "__id__": 207 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -3731,11 +3857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -3759,11 +3885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3807,11 +3933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 212 }, "_alignFlags": 45, "_target": null, @@ -3856,11 +3982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -3884,11 +4010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3932,11 +4058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 219 }, "_alignFlags": 45, "_target": null, @@ -3981,27 +4107,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 216 + "__id__": 222 } ], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 230 }, { - "__id__": 226 + "__id__": 232 }, { - "__id__": 228 + "__id__": 234 } ], "_prefab": { - "__id__": 230 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -4038,23 +4164,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 215 + "__id__": 221 }, "_children": [], "_active": true, "_components": [ { - "__id__": 217 + "__id__": 223 }, { - "__id__": 219 + "__id__": 225 }, { - "__id__": 221 + "__id__": 227 } ], "_prefab": { - "__id__": 223 + "__id__": 229 }, "_lpos": { "__type__": "cc.Vec3", @@ -4091,11 +4217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -4119,11 +4245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4164,11 +4290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 228 }, "_alignFlags": 45, "_target": null, @@ -4213,11 +4339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -4241,11 +4367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4289,11 +4415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 235 }, "_alignFlags": 45, "_target": null, @@ -4338,27 +4464,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 232 + "__id__": 238 } ], "_active": false, "_components": [ { - "__id__": 240 + "__id__": 246 }, { - "__id__": 242 + "__id__": 248 }, { - "__id__": 244 + "__id__": 250 } ], "_prefab": { - "__id__": 246 + "__id__": 252 }, "_lpos": { "__type__": "cc.Vec3", @@ -4395,23 +4521,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 231 + "__id__": 237 }, "_children": [], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 239 }, { - "__id__": 235 + "__id__": 241 }, { - "__id__": 237 + "__id__": 243 } ], "_prefab": { - "__id__": 239 + "__id__": 245 }, "_lpos": { "__type__": "cc.Vec3", @@ -4448,11 +4574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 240 }, "_contentSize": { "__type__": "cc.Size", @@ -4476,11 +4602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 242 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4524,11 +4650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 244 }, "_alignFlags": 45, "_target": null, @@ -4573,11 +4699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 247 }, "_contentSize": { "__type__": "cc.Size", @@ -4601,11 +4727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 249 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4649,11 +4775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 251 }, "_alignFlags": 45, "_target": null, @@ -4698,27 +4824,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 248 + "__id__": 254 } ], "_active": false, "_components": [ { - "__id__": 256 + "__id__": 262 }, { - "__id__": 258 + "__id__": 264 }, { - "__id__": 260 + "__id__": 266 } ], "_prefab": { - "__id__": 262 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", @@ -4755,23 +4881,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 247 + "__id__": 253 }, "_children": [], "_active": true, "_components": [ { - "__id__": 249 + "__id__": 255 }, { - "__id__": 251 + "__id__": 257 }, { - "__id__": 253 + "__id__": 259 } ], "_prefab": { - "__id__": 255 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", @@ -4808,11 +4934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 256 }, "_contentSize": { "__type__": "cc.Size", @@ -4836,11 +4962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 258 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4884,11 +5010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 260 }, "_alignFlags": 45, "_target": null, @@ -4933,11 +5059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -4961,11 +5087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 265 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5009,11 +5135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 267 }, "_alignFlags": 45, "_target": null, @@ -5058,27 +5184,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 264 + "__id__": 270 } ], "_active": false, "_components": [ { - "__id__": 272 + "__id__": 278 }, { - "__id__": 274 + "__id__": 280 }, { - "__id__": 276 + "__id__": 282 } ], "_prefab": { - "__id__": 278 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -5115,23 +5241,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 269 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 271 }, { - "__id__": 267 + "__id__": 273 }, { - "__id__": 269 + "__id__": 275 } ], "_prefab": { - "__id__": 271 + "__id__": 277 }, "_lpos": { "__type__": "cc.Vec3", @@ -5168,11 +5294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5196,11 +5322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5244,11 +5370,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 276 }, "_alignFlags": 45, "_target": null, @@ -5293,11 +5419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", @@ -5321,11 +5447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 281 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5369,11 +5495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 283 }, "_alignFlags": 45, "_target": null, @@ -5418,27 +5544,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 204 }, "_children": [ { - "__id__": 280 + "__id__": 286 }, { - "__id__": 288 + "__id__": 294 }, { - "__id__": 296 + "__id__": 302 } ], "_active": false, "_components": [ { - "__id__": 304 + "__id__": 310 } ], "_prefab": { - "__id__": 306 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -5475,23 +5601,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 287 }, { - "__id__": 283 + "__id__": 289 }, { - "__id__": 285 + "__id__": 291 } ], "_prefab": { - "__id__": 287 + "__id__": 293 }, "_lpos": { "__type__": "cc.Vec3", @@ -5528,11 +5654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 288 }, "_contentSize": { "__type__": "cc.Size", @@ -5556,11 +5682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 290 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5601,11 +5727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 292 }, "_alignFlags": 45, "_target": null, @@ -5650,23 +5776,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 289 + "__id__": 295 }, { - "__id__": 291 + "__id__": 297 }, { - "__id__": 293 + "__id__": 299 } ], "_prefab": { - "__id__": 295 + "__id__": 301 }, "_lpos": { "__type__": "cc.Vec3", @@ -5703,11 +5829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 296 }, "_contentSize": { "__type__": "cc.Size", @@ -5731,11 +5857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 298 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5776,11 +5902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 300 }, "_alignFlags": 45, "_target": null, @@ -5825,23 +5951,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 285 }, "_children": [], "_active": true, "_components": [ { - "__id__": 297 + "__id__": 303 }, { - "__id__": 299 + "__id__": 305 }, { - "__id__": 301 + "__id__": 307 } ], "_prefab": { - "__id__": 303 + "__id__": 309 }, "_lpos": { "__type__": "cc.Vec3", @@ -5878,11 +6004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 304 }, "_contentSize": { "__type__": "cc.Size", @@ -5906,11 +6032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 306 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5951,11 +6077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 308 }, "_alignFlags": 45, "_target": null, @@ -6000,11 +6126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 311 }, "_contentSize": { "__type__": "cc.Size", @@ -6041,11 +6167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -6069,11 +6195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 204 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 316 }, "_alignFlags": 45, "_target": null, @@ -6118,11 +6244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6182,20 +6308,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 320 }, "_children": [], "_active": true, "_components": [ { - "__id__": 358 + "__id__": 364 }, { - "__id__": 312 + "__id__": 318 } ], "_prefab": { - "__id__": 360 + "__id__": 366 }, "_lpos": { "__type__": "cc.Vec3", @@ -6234,27 +6360,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 315 + "__id__": 321 }, "_children": [ { - "__id__": 347 + "__id__": 353 }, { - "__id__": 313 + "__id__": 319 } ], "_active": true, "_components": [ { - "__id__": 353 + "__id__": 359 }, { - "__id__": 355 + "__id__": 361 } ], "_prefab": { - "__id__": 357 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -6291,33 +6417,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 119 + "__id__": 125 }, "_children": [ - { - "__id__": 316 - }, - { - "__id__": 314 - }, { "__id__": 322 + }, + { + "__id__": 320 + }, + { + "__id__": 328 } ], "_active": true, "_components": [ { - "__id__": 340 + "__id__": 346 }, { - "__id__": 342 + "__id__": 348 }, { - "__id__": 344 + "__id__": 350 } ], "_prefab": { - "__id__": 346 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -6356,20 +6482,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 315 + "__id__": 321 }, "_children": [], "_active": false, "_components": [ { - "__id__": 317 + "__id__": 323 }, { - "__id__": 319 + "__id__": 325 } ], "_prefab": { - "__id__": 321 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -6406,11 +6532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 324 }, "_contentSize": { "__type__": "cc.Size", @@ -6434,11 +6560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 316 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6517,27 +6643,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 315 + "__id__": 321 }, "_children": [ { - "__id__": 323 + "__id__": 329 }, { - "__id__": 329 + "__id__": 335 } ], "_active": false, "_components": [ { - "__id__": 335 + "__id__": 341 }, { - "__id__": 337 + "__id__": 343 } ], "_prefab": { - "__id__": 339 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -6574,20 +6700,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 328 }, "_children": [], "_active": true, "_components": [ { - "__id__": 324 + "__id__": 330 }, { - "__id__": 326 + "__id__": 332 } ], "_prefab": { - "__id__": 328 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -6624,11 +6750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -6652,11 +6778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6713,20 +6839,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 328 }, "_children": [], "_active": true, "_components": [ { - "__id__": 330 + "__id__": 336 }, { - "__id__": 332 + "__id__": 338 } ], "_prefab": { - "__id__": 334 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -6763,11 +6889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -6791,11 +6917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 329 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 339 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6872,11 +6998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -6900,11 +7026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 344 }, "_resizeMode": 1, "_layoutType": 1, @@ -6951,11 +7077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -6979,11 +7105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 349 }, "_alignFlags": 45, "_target": null, @@ -7015,11 +7141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 351 }, "_resizeMode": 1, "_layoutType": 2, @@ -7066,20 +7192,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 320 }, "_children": [], "_active": true, "_components": [ { - "__id__": 348 + "__id__": 354 }, { - "__id__": 350 + "__id__": 356 } ], "_prefab": { - "__id__": 352 + "__id__": 358 }, "_lpos": { "__type__": "cc.Vec3", @@ -7116,11 +7242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -7144,11 +7270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 353 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7202,11 +7328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 360 }, "_contentSize": { "__type__": "cc.Size", @@ -7230,11 +7356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 362 }, "_resizeMode": 1, "_layoutType": 1, @@ -7281,11 +7407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 313 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -7332,18 +7458,18 @@ "instance": null, "targetOverrides": [ { - "__id__": 363 + "__id__": 369 }, { - "__id__": 365 + "__id__": 371 }, { - "__id__": 367 + "__id__": 373 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 119 + "__id__": 125 }, { "__id__": 40 @@ -7356,7 +7482,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 156 + "__id__": 162 }, "sourceInfo": null, "propertyPath": [ @@ -7366,7 +7492,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 364 + "__id__": 370 } }, { @@ -7378,7 +7504,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 156 + "__id__": 162 }, "sourceInfo": null, "propertyPath": [ @@ -7388,7 +7514,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 366 + "__id__": 372 } }, { @@ -7400,17 +7526,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 156 + "__id__": 162 }, "sourceInfo": null, "propertyPath": [ "cost_label" ], "target": { - "__id__": 119 + "__id__": 125 }, "targetInfo": { - "__id__": 368 + "__id__": 374 } }, { diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts index bb702209..0b204e0c 100644 --- a/assets/script/game/common/config/HeroSkillDesc.ts +++ b/assets/script/game/common/config/HeroSkillDesc.ts @@ -33,6 +33,7 @@ import { FieldSkillSet, mergeSkillParams, SkillConfig, SkillKind, SkillOverrides import { FieldDescSet, FieldValueFmt, SkillDescSet } from "./SkillDescSet"; import { BuffList } from "./BuffSet"; import { Attrs } from "./HeroAttrs"; +import { CardConfig } from "./CardSet"; /** * 生成器入参窄接口：只约束实际读取的字段。 @@ -91,6 +92,9 @@ const RICH_NAME_COLOR = "#2E86C1"; /** 技能名「」匹配模式（仅本模块行首/行中技能名片段使用） */ const SKILL_NAME_PATTERN = /「([^」]*)」/g; +/** "持续X秒"匹配模式（卡片描述后处理：把持续时间数值也高亮） */ +const DURATION_PATTERN = /持续(\d+)秒/g; + /** 解析目标描述文本（与战斗 SCastSystem 目标选取语义严格一致） */ function buildTargetDesc(skill: SkillConfig): string { switch (skill.TGroup) { @@ -374,3 +378,92 @@ export function buildEquipRich(fieldUuids: number[]): string { } return lines.length > 0 ? lines.join("\n") : "无词条"; } + +/** + * 把"持续X秒"中的 X 也包裹绿色高亮（卡片描述后处理）。 + * Why: 计时模板 {dur} 不在 \x01\x02 高亮标记内，renderLineRich 仅高亮主数值； + * 持续时间对药水/计时 buff 同样关键，这里补充高亮，保证视觉一致。 + */ +function highlightDuration(text: string): string { + return text.replace(DURATION_PATTERN, `持续$1秒`); +} + +/** + * 结构化行 → 富文本串（技能名蓝色、数值绿色）。 + * buildEquipRich / buildCardDescRich 共用，保证渲染规则唯一。 + */ +function renderLineRich(line: ISkillLine): string { + const prefix = line.prefix.replace(SKILL_NAME_PATTERN, `「$1」`); + return line.value + ? `${prefix}${line.value}${line.suffix}` + : `${prefix}${line.suffix}`; +} + +/** + * 扫描合并后技能的附加概率字段（crt/frz/stun/bck），非零的拼为高亮后缀。 + * Why: 模板不再硬编码"有概率击晕"等文案，由实际配置驱动，避免描述与数值漂移。 + * @returns 形如 ",30%击晕,20%冰冻"；全为 0 时返回 "" + */ +function buildChanceSuffix(skill: SkillConfig): string { + const items: string[] = []; + const push = (val: number | undefined, label: string) => { + if (val && val > 0) items.push(`附加${val}%${label}`); + }; + push(skill.crt, "暴击"); + push(skill.frz, "冰冻"); + push(skill.stun, "击晕"); + push(skill.bck, "击退"); + return items.length > 0 ? `,${items.join(",")}` : ""; +} + +/** + * 商店卡片描述富文本（SCardComp / ItemListComp 用，BBCode）。 + * + * Why: 卡片 info 为手写文案，与 SkillSet/BuffList 数值易漂移。 + * 本函数从 CardConfig.skill + overrides 合并后的实时配置生成描述， + * 数值随档位（如高级药水 buff_value）自动同步，数值绿色高亮、技能名蓝色。 + * + * 描述规则： + * - 药品/技能卡（card.skill 有效）→ 查 SkillDescSet 模板渲染（计时模式取 BuffList 默认值兜底）； + * 未入表技能回退 SkillSet.info / card.info，整行不高亮。 + * - 装备卡（card.field 有效）→ 复用 buildEquipRich 逐词条渲染。 + * - 触发节奏（t_times/t_inv）融入单行描述：定时触发"每M秒释放一次「技能名」，xxx，共N次"；即时触发仅显示效果。 + * + * @param card 卡片配置（SCardSet 技能卡 / ICardSet 药品卡 / EquipSet 装备卡） + * @returns 多行富文本串；无可描述内容时回退 card.info + */ +export function buildCardDescRich(card: CardConfig): string { + // 装备卡：逐词条渲染驻场光环 + if (card.field && card.field.length > 0) { + return buildEquipRich(card.field); + } + + // 药品/技能卡：合并覆写后按 SkillDescSet 模板渲染 + const base = card.skill ? SkillSet[card.skill] : undefined; + if (base) { + const skill = mergeSkillParams(base, card.overrides); + const line = buildEffectLine("", skill); + // 未入表技能回退链：SkillSet.info → card.info + if (!line.value && !SkillDescSet[skill.uuid]) { + return String(skill.info || card.info || ""); + } + + // 触发节奏融入描述：定时触发"每M秒释放一次「技能名」，xxx，共N次"；即时触发直接描述 + const tTimes = card.t_times ?? 1; + const tInv = card.t_inv ?? 0; + const isInstant = card.is_inst || tInv <= 0; + // 附加概率后缀（暴击/冰冻/击晕/击退），由实际配置驱动 + const suffix = buildChanceSuffix(skill); + const rich = highlightDuration(renderLineRich(line)) + suffix; + + if (isInstant) { + return rich; + } + + const rhythm = `每${tInv}秒释放一次「${skill.name}」`; + const times = `，共${tTimes}次`; + return `${rhythm}，${rich}${times}`; + } + + return card.info || ""; +} diff --git a/assets/script/game/common/config/ICardSet.ts b/assets/script/game/common/config/ICardSet.ts index 49f55c98..b59f0033 100644 --- a/assets/script/game/common/config/ICardSet.ts +++ b/assets/script/game/common/config/ICardSet.ts @@ -33,24 +33,24 @@ interface ItemCardRaw { const ItemCardData: ItemCardRaw[] = [ // ==================== 一次性回血（计时性 HoT，5s） ==================== - { uuid: 9101, skill: 6502, icon: "Sub_Item-FA_WP_Sub_Potion_001_Green", name: "再生药水", info: "全体友方每秒回复生命，持续 5 秒", cost: 0, weight: 20 }, + { uuid: 9101, skill: 6502, icon: "Sub_Item-FA_WP_Sub_Potion_001_Green", name: "再生药水", info: "全体友方持续回复生命", cost: 0, weight: 20 }, // ==================== 计时性强化（统一 5s） ==================== - { uuid: 9102, skill: 6503, icon: "Sub_Item-FA_WP_Sub_Potion_001_Red", name: "攻击药水", info: "全体友方攻击力提升 50%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9103, skill: 6504, icon: "Sub_Item-FA_WP_Sub_Potion_001_Yellow", name: "暴击药水", info: "全体友方暴击率提升 30%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9104, skill: 6505, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "击退药水", info: "全体友方击退概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9105, skill: 6506, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "穿透药水", info: "全体友方穿透概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9106, skill: 6507, icon: "Sub_Item-FA_WP_Sub_Potion_001_Red", name: "攻速药水", info: "全体友方攻击速度提升 40%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9107, skill: 6508, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "风怒药水", info: "全体友方风怒概率提升 20%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9108, skill: 6509, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "击晕药水", info: "全体友方击晕概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9109, skill: 6510, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "击晕抗性药水", info: "全体友方击晕抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, - { uuid: 9110, skill: 6511, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "冰冻抗性药水", info: "全体友方冰冻抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, + { uuid: 9102, skill: 6503, icon: "Sub_Item-FA_WP_Sub_Potion_001_Red", name: "攻击药水", info: "全体友方攻击力提升", cost: 0, weight: 15 }, + { uuid: 9103, skill: 6504, icon: "Sub_Item-FA_WP_Sub_Potion_001_Yellow", name: "暴击药水", info: "全体友方暴击率提升", cost: 0, weight: 15 }, + { uuid: 9104, skill: 6505, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "击退药水", info: "全体友方击退概率提升", cost: 0, weight: 12 }, + { uuid: 9105, skill: 6506, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "穿透药水", info: "全体友方穿透概率提升", cost: 0, weight: 12 }, + { uuid: 9106, skill: 6507, icon: "Sub_Item-FA_WP_Sub_Potion_001_Red", name: "攻速药水", info: "全体友方攻击速度提升", cost: 0, weight: 15 }, + { uuid: 9107, skill: 6508, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "风怒药水", info: "全体友方风怒概率提升", cost: 0, weight: 12 }, + { uuid: 9108, skill: 6509, icon: "Sub_Item-FA_WP_Sub_Potion_001_Purple", name: "击晕药水", info: "全体友方击晕概率提升", cost: 0, weight: 12 }, + { uuid: 9109, skill: 6510, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "击晕抗性药水", info: "全体友方击晕抗性提升", cost: 4, weight: 10 }, + { uuid: 9110, skill: 6511, icon: "Sub_Item-FA_WP_Sub_Potion_001_Blue", name: "冰冻抗性药水", info: "全体友方冰冻抗性提升", cost: 4, weight: 10 }, // ==================== 高级档（buff_value 覆写，复用同一技能底座） ==================== - { uuid: 9201, skill: 6502, icon: "Sub_Item-FA_WP_Sub_Potion_002_Green", name: "高级再生药水", info: "全体友方每秒回复 25 生命，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 25 } }, - { uuid: 9202, skill: 6503, icon: "Sub_Item-FA_WP_Sub_Potion_002_Red", name: "高级攻击药水", info: "全体友方攻击力提升 80%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 80 } }, - { uuid: 9203, skill: 6504, icon: "Sub_Item-FA_WP_Sub_Potion_002_Yellow", name: "高级暴击药水", info: "全体友方暴击率提升 50%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 50 } }, - { uuid: 9206, skill: 6507, icon: "Sub_Item-FA_WP_Sub_Potion_002_Red", name: "高级攻速药水", info: "全体友方攻击速度提升 70%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 70 } }, + { uuid: 9201, skill: 6502, icon: "Sub_Item-FA_WP_Sub_Potion_002_Green", name: "高级再生药水", info: "全体友方持续回复生命", cost: 0, weight: 8, overrides: { buff_value: 25 } }, + { uuid: 9202, skill: 6503, icon: "Sub_Item-FA_WP_Sub_Potion_002_Red", name: "高级攻击药水", info: "全体友方攻击力提升", cost: 0, weight: 8, overrides: { buff_value: 80 } }, + { uuid: 9203, skill: 6504, icon: "Sub_Item-FA_WP_Sub_Potion_002_Yellow", name: "高级暴击药水", info: "全体友方暴击率提升", cost: 0, weight: 8, overrides: { buff_value: 50 } }, + { uuid: 9206, skill: 6507, icon: "Sub_Item-FA_WP_Sub_Potion_002_Red", name: "高级攻速药水", info: "全体友方攻击速度提升", cost: 0, weight: 8, overrides: { buff_value: 70 } }, ]; /** diff --git a/assets/script/game/common/config/SkillDescSet.ts b/assets/script/game/common/config/SkillDescSet.ts index d24844d8..d0da0239 100644 --- a/assets/script/game/common/config/SkillDescSet.ts +++ b/assets/script/game/common/config/SkillDescSet.ts @@ -99,6 +99,86 @@ export const SkillDescSet: Record = { verb: "", unit: "", permField: "ap", templPerm: "{target}以{value}%生命复活", }, + + // ==================== 技能商店范围攻击卡（6201-6206）：ap = 单段伤害 ==================== + // 注：暴击/冰冻/击晕/击退等附加概率由 buildCardDescRich 扫描 crt/frz/stun/bck 动态追加，不在模板写死 + 6201: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + 6202: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + 6203: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + 6204: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + 6205: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + 6206: { + verb: "", unit: "", permField: "ap", + templPerm: "每段造成{value}点伤害", + }, + + // ==================== 计时性强化技能（6502-6511，药水底座，走 timed_buff_id） ==================== + // 数值取自 BuffList 默认修饰值或药水卡 overrides.buff_value，持续时间取 BuffList.duration + 6502: { + verb: "", unit: "", permField: "ap", timedField: "buff_value", + templPerm: "{target}回复生命", + templTimed: "{target}每秒回复{value}点生命，持续{dur}秒", + }, + 6503: { + verb: "攻击力提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6504: { + verb: "暴击率提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6505: { + verb: "击退概率提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6506: { + verb: "穿透概率提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6507: { + verb: "攻击速度提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6508: { + verb: "风怒概率提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6509: { + verb: "击晕概率提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6510: { + verb: "击晕抗性提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, + 6511: { + verb: "冰冻抗性提升", unit: "%", permField: "ap", timedField: "buff_value", + templPerm: "{target}{verb}{value}{unit}", + templTimed: "{target}{verb}{value}{unit}，持续{dur}秒", + }, }; /** diff --git a/assets/script/game/map/ItemListComp.ts b/assets/script/game/map/ItemListComp.ts index cf5d2b6a..1f5dcc0c 100644 --- a/assets/script/game/map/ItemListComp.ts +++ b/assets/script/game/map/ItemListComp.ts @@ -14,12 +14,12 @@ * 本组件同时服务于装备商店和商品商店，通过 cardData 的 trigger_type / kind 自动判断类型。 */ 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, CardTriggerType, CKind } from "../common/config/CardSet"; import { EquipPoolList } from "../common/config/EquipSet"; -import { FieldSkillSet } from "../common/config/SkillSet"; +import { buildCardDescRich, 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"; @@ -52,15 +52,9 @@ export class ItemListComp 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; + /** 描述/属性词条富文本（多行，数值绿色高亮、技能名蓝色） */ + @property(RichText) + private info_rich: RichText = null; /** 等级标签 */ @property(Label) @@ -169,42 +163,18 @@ export class ItemListComp extends CCComp { // 背景：按 card_lv 激活对应颜色子节点（1→green 2→blue 3→purple 4→red 5→yellow） this.updateBgNode(); - // 描述/属性词条（最多显示 3 条） - const fieldLabels = [this.fied1, this.fied2, this.fied3]; - if (isEquip) { - // 装备：显示 field 词条 - 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; - } - } - } else if (isPotion) { - // 商品：仅显示卡牌 info - const cardInfo = this.cardData.info || ""; - - if (fieldLabels[0]) { - fieldLabels[0].string = cardInfo; - fieldLabels[0].node.active = !!cardInfo; - } - for (let i = 1; i < fieldLabels.length; i++) { - if (!fieldLabels[i]) continue; - fieldLabels[i].string = ""; - fieldLabels[i].node.active = false; - } - } else { - // 其他类型：显示 info - for (let i = 0; i < fieldLabels.length; i++) { - if (!fieldLabels[i]) continue; - fieldLabels[i].string = i === 0 ? (this.cardData.info || "") : ""; - fieldLabels[i].node.active = i === 0 && !!this.cardData.info; + // 描述/属性词条富文本（装备逐词条多行；药品/技能卡数值随 overrides 档位自动同步） + if (this.info_rich) { + let desc = ""; + if (isEquip) { + desc = buildEquipRich(this.cardData.field || []); + } else if (isPotion) { + desc = buildCardDescRich(this.cardData); + } else { + desc = this.cardData.info || ""; } + this.info_rich.string = desc; + this.info_rich.node.active = !!desc; } // 图标（共享工具解析：cardData.icon → FieldSkillSet） diff --git a/assets/script/game/map/SCardComp.ts b/assets/script/game/map/SCardComp.ts index c7999655..f2358fc1 100644 --- a/assets/script/game/map/SCardComp.ts +++ b/assets/script/game/map/SCardComp.ts @@ -11,12 +11,13 @@ * 由 MissSkillsComp 接收并创建 SBox 实体 / SkillBoxComp 执行技能逻辑。 */ import { mLogger } from "../common/Logger"; -import { _decorator, Node, Sprite, Label, NodeEventType, Vec3, UIOpacity, tween, Tween } from "cc"; +import { _decorator, Node, Sprite, 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 { SkillCardList } from "../common/config/SCardSet"; -import { FieldSkillSet, SkillSet, SkillConfig } from "../common/config/SkillSet"; +import { SkillSet } from "../common/config/SkillSet"; +import { buildCardDescRich } 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 +51,9 @@ export class SCardComp 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; + /** 描述富文本（多行，数值绿色高亮、技能名蓝色，由 buildCardDescRich 生成） */ + @property(RichText) + private info_rich: RichText = null; /** 等级标签 */ @property(Label) @@ -165,12 +160,9 @@ export class SCardComp extends CCComp { 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); @@ -204,13 +196,11 @@ export class SCardComp 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 = this.getDescription(skillCard, skill); - 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; + // 描述富文本（数值随 overrides 档位自动同步高亮） + if (this.info_rich) { + const desc = buildCardDescRich(this.cardData); + this.info_rich.string = desc; + this.info_rich.node.active = !!desc; } // 图标（共享工具解析：cardData.icon → FieldSkillSet → SkillSet） @@ -358,15 +348,6 @@ export class SCardComp extends CCComp { .start(); } - /** 获取技能描述：驻场技能取 FieldSkillSet，其余取技能/卡牌配置 */ - private getDescription(skillCard: CardConfig | undefined, skill: SkillConfig | null): string { - if (!this.cardData) return ""; - if (this.cardData.field && this.cardData.field.length > 0) { - return FieldSkillSet[this.cardData.field[0]]?.info || ""; - } - return skillCard?.info || skill?.info || this.cardData.info || ""; - } - // ======================== 购买逻辑 ======================== /**