From df519fdc4ef00e2e7376e015fa063c73af3d6429 Mon Sep 17 00:00:00 2001 From: pan Date: Tue, 25 Aug 2026 16:29:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(talent):=20=E9=87=8D=E6=9E=84=E5=A4=A9?= =?UTF-8?q?=E8=B5=8B=E7=B3=BB=E7=BB=9F=E4=B8=BA=E4=B8=89=E9=98=B6=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=B9=B6=E5=AE=9E=E7=8E=B0=E5=85=A8=E6=96=B0UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 重构天赋系统为一阶基础/二阶专精/三阶超强三阶结构，移除前置天赋要求改为阶位累计点数解锁 2. 新增阶位解锁校验逻辑与天赋点投入统计 3. 重做天赋UI为三阶Tab页签+迷你升级卡样式，支持状态展示与一键升级 4. 补充新的天赋配置与属性加成，更新天赋系统文档 5. 修复属性计算问题，新增暴击伤害与穿刺伤害加成支持 --- .gitignore | 3 + assets/resources/gui/element/heros.prefab | 1727 ++++++------- .../gui/element/prefab_talent_item.prefab | 2175 ++++++++++++++++- assets/resources/gui/element/sibox.prefab | 2 +- assets/resources/gui/element/talents.prefab | 8 + .../script/game/common/SingletonModuleComp.ts | 12 +- assets/script/game/common/config/TalentSet.ts | 259 +- .../game/common/config/talent-system.md | 182 +- assets/script/game/hero/Hero.ts | 2 +- assets/script/game/map/MissionCardComp.ts | 2 + assets/script/game/map/TalentItemComp.ts | 129 +- assets/script/game/map/TalentsComp.ts | 259 +- 12 files changed, 3595 insertions(+), 1165 deletions(-) diff --git a/.gitignore b/.gitignore index b66f6021..e873117f 100644 --- a/.gitignore +++ b/.gitignore @@ -167,3 +167,6 @@ $RECYCLE.BIN/ *.msm *.msp *.lnk + +# brainstorm visual companion +.superpowers/ diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 71fc3397..ddca015b 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,29 +25,29 @@ "__id__": 88 }, { - "__id__": 541 + "__id__": 542 }, { - "__id__": 555 + "__id__": 556 } ], "_active": true, "_components": [ { - "__id__": 653 + "__id__": 654 }, { - "__id__": 655 + "__id__": 656 }, { - "__id__": 657 + "__id__": 658 }, { - "__id__": 659 + "__id__": 660 } ], "_prefab": { - "__id__": 661 + "__id__": 662 }, "_lpos": { "__type__": "cc.Vec3", @@ -1254,26 +1254,26 @@ "__id__": 89 }, { - "__id__": 204 + "__id__": 205 }, { - "__id__": 380 + "__id__": 381 }, { - "__id__": 408 + "__id__": 409 } ], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 537 }, { - "__id__": 538 + "__id__": 539 } ], "_prefab": { - "__id__": 540 + "__id__": 541 }, "_lpos": { "__type__": "cc.Vec3", @@ -1323,26 +1323,26 @@ "__id__": 104 }, { - "__id__": 133 + "__id__": 134 }, { - "__id__": 139 + "__id__": 140 }, { - "__id__": 169 + "__id__": 170 } ], "_active": true, "_components": [ { - "__id__": 199 + "__id__": 200 }, { - "__id__": 201 + "__id__": 202 } ], "_prefab": { - "__id__": 203 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,7 +1397,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 33.182, + "y": 70.97, "z": 0 }, "_lrot": { @@ -1690,17 +1690,17 @@ "__id__": 105 }, { - "__id__": 122 + "__id__": 123 } ], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 131 } ], "_prefab": { - "__id__": 132 + "__id__": 133 }, "_lpos": { "__type__": "cc.Vec3", @@ -1792,6 +1792,9 @@ }, { "__id__": 121 + }, + { + "__id__": 122 } ], "removedComponents": [] @@ -1953,6 +1956,16 @@ "z": 1 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 109 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "name", @@ -1965,22 +1978,22 @@ "_active": true, "_components": [ { - "__id__": 123 + "__id__": 124 }, { - "__id__": 125 + "__id__": 126 }, { - "__id__": 127 + "__id__": 128 } ], "_prefab": { - "__id__": 129 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -249.645, + "y": 6.869999999999997, "z": 0 }, "_lrot": { @@ -2012,11 +2025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2040,11 +2053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2057,10 +2070,10 @@ "a": 255 }, "_string": "名称", - "_horizontalAlign": 1, + "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 50, + "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 60, "_overflow": 2, @@ -2108,19 +2121,19 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 129 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 20, + "_top": 13.130000000000003, "_bottom": 0, - "_horizontalCenter": 0, + "_horizontalCenter": -249.645, "_verticalCenter": 0, "_isAbsLeft": true, "_isAbsRight": true, @@ -2161,7 +2174,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 132 }, "_contentSize": { "__type__": "cc.Size", @@ -2204,19 +2217,19 @@ "_active": true, "_components": [ { - "__id__": 134 + "__id__": 135 }, { - "__id__": 136 + "__id__": 137 } ], "_prefab": { - "__id__": 138 + "__id__": 139 }, "_lpos": { "__type__": "cc.Vec3", - "x": -1.537, - "y": 204.531, + "x": -127.514, + "y": 262.93, "z": 0 }, "_lrot": { @@ -2248,11 +2261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 136 }, "_contentSize": { "__type__": "cc.Size", @@ -2276,11 +2289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 138 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2361,25 +2374,25 @@ }, "_children": [ { - "__id__": 140 + "__id__": 141 }, { - "__id__": 160 + "__id__": 161 } ], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 167 } ], "_prefab": { - "__id__": 168 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", - "x": 268.323, - "y": 154.465, + "x": -279.06, + "y": 205.994, "z": 0 }, "_lrot": { @@ -2411,24 +2424,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 140 }, "_children": [ { - "__id__": 141 + "__id__": 142 }, { - "__id__": 149 + "__id__": 150 } ], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 158 } ], "_prefab": { - "__id__": 159 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -2465,23 +2478,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 140 + "__id__": 141 }, "_children": [], "_active": true, "_components": [ { - "__id__": 142 + "__id__": 143 }, { - "__id__": 144 + "__id__": 145 }, { - "__id__": 146 + "__id__": 147 } ], "_prefab": { - "__id__": 148 + "__id__": 149 }, "_lpos": { "__type__": "cc.Vec3", @@ -2518,11 +2531,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 144 }, "_contentSize": { "__type__": "cc.Size", @@ -2546,11 +2559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 146 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2591,11 +2604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 148 }, "_alignFlags": 40, "_target": null, @@ -2640,23 +2653,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 140 + "__id__": 141 }, "_children": [], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 151 }, { - "__id__": 152 + "__id__": 153 }, { - "__id__": 154 + "__id__": 155 } ], "_prefab": { - "__id__": 156 + "__id__": 157 }, "_lpos": { "__type__": "cc.Vec3", @@ -2693,11 +2706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -2721,11 +2734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2766,11 +2779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 156 }, "_alignFlags": 40, "_target": null, @@ -2815,11 +2828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -2856,20 +2869,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 140 }, "_children": [], "_active": true, "_components": [ { - "__id__": 161 + "__id__": 162 }, { - "__id__": 163 + "__id__": 164 } ], "_prefab": { - "__id__": 165 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -2906,11 +2919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 163 }, "_contentSize": { "__type__": "cc.Size", @@ -2934,11 +2947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 165 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3015,11 +3028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 168 }, "_contentSize": { "__type__": "cc.Size", @@ -3060,25 +3073,25 @@ }, "_children": [ { - "__id__": 170 + "__id__": 171 }, { - "__id__": 190 + "__id__": 191 } ], "_active": true, "_components": [ { - "__id__": 196 + "__id__": 197 } ], "_prefab": { - "__id__": 198 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", - "x": 270.82, - "y": 99.045, + "x": -147.152, + "y": 205.537, "z": 0 }, "_lrot": { @@ -3110,24 +3123,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 170 }, "_children": [ { - "__id__": 171 + "__id__": 172 }, { - "__id__": 179 + "__id__": 180 } ], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 188 } ], "_prefab": { - "__id__": 189 + "__id__": 190 }, "_lpos": { "__type__": "cc.Vec3", @@ -3164,23 +3177,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 170 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 173 }, { - "__id__": 174 + "__id__": 175 }, { - "__id__": 176 + "__id__": 177 } ], "_prefab": { - "__id__": 178 + "__id__": 179 }, "_lpos": { "__type__": "cc.Vec3", @@ -3217,11 +3230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 174 }, "_contentSize": { "__type__": "cc.Size", @@ -3245,11 +3258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 176 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3290,11 +3303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 178 }, "_alignFlags": 40, "_target": null, @@ -3339,23 +3352,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 170 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 181 }, { - "__id__": 182 + "__id__": 183 }, { - "__id__": 184 + "__id__": 185 } ], "_prefab": { - "__id__": 186 + "__id__": 187 }, "_lpos": { "__type__": "cc.Vec3", @@ -3392,11 +3405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 179 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -3420,11 +3433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 179 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 184 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3465,11 +3478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 179 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 186 }, "_alignFlags": 40, "_target": null, @@ -3514,11 +3527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -3555,20 +3568,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 170 }, "_children": [], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 192 }, { - "__id__": 193 + "__id__": 194 } ], "_prefab": { - "__id__": 195 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -3605,11 +3618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -3633,11 +3646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3714,11 +3727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 170 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -3759,7 +3772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -3787,7 +3800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 203 }, "_alignFlags": 1, "_target": null, @@ -3836,37 +3849,37 @@ }, "_children": [ { - "__id__": 205 + "__id__": 206 }, { - "__id__": 247 + "__id__": 248 }, { - "__id__": 289 + "__id__": 290 }, { - "__id__": 331 + "__id__": 332 } ], "_active": true, "_components": [ { - "__id__": 373 + "__id__": 374 }, { - "__id__": 375 + "__id__": 376 }, { - "__id__": 377 + "__id__": 378 } ], "_prefab": { - "__id__": 379 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", - "x": -229.124, - "y": 177.10699999999997, + "x": 2.164, + "y": 8.701999999999984, "z": 0 }, "_lrot": { @@ -3898,35 +3911,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 205 }, "_children": [ { - "__id__": 206 + "__id__": 207 }, { - "__id__": 214 + "__id__": 215 } ], "_active": true, "_components": [ { - "__id__": 240 + "__id__": 241 }, { - "__id__": 242 + "__id__": 243 }, { - "__id__": 244 + "__id__": 245 } ], "_prefab": { - "__id__": 246 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, - "y": 112.5, + "x": -325, + "y": 29.950000000000003, "z": 0 }, "_lrot": { @@ -3958,27 +3971,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 208 }, { - "__id__": 209 + "__id__": 210 }, { - "__id__": 211 + "__id__": 212 } ], "_prefab": { - "__id__": 213 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", - "x": 100, + "x": 105, "y": 0, "z": 0 }, @@ -4011,15 +4024,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", - "width": 400, + "width": 420, "height": 110 }, "_anchorPoint": { @@ -4039,11 +4052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4087,11 +4100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 213 }, "_alignFlags": 45, "_target": null, @@ -4136,24 +4149,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 206 }, "_children": [ { - "__id__": 215 + "__id__": 216 }, { - "__id__": 221 + "__id__": 222 } ], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 238 } ], "_prefab": { - "__id__": 239 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -4190,20 +4203,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 215 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 217 }, { - "__id__": 218 + "__id__": 219 } ], "_prefab": { - "__id__": 220 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -4240,11 +4253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -4268,11 +4281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4329,24 +4342,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 215 }, "_children": [ { - "__id__": 222 + "__id__": 223 }, { - "__id__": 228 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 234 + "__id__": 235 } ], "_prefab": { - "__id__": 236 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -4383,20 +4396,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 221 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 224 }, { - "__id__": 225 + "__id__": 226 } ], "_prefab": { - "__id__": 227 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4433,11 +4446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4461,11 +4474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4542,20 +4555,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 221 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 230 }, { - "__id__": 231 + "__id__": 232 } ], "_prefab": { - "__id__": 233 + "__id__": 234 }, "_lpos": { "__type__": "cc.Vec3", @@ -4592,11 +4605,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -4620,11 +4633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 228 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4701,11 +4714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 236 }, "_contentSize": { "__type__": "cc.Size", @@ -4742,11 +4755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -4783,15 +4796,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 210, "height": 50 }, "_anchorPoint": { @@ -4811,11 +4824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 206 }, "_enabled": false, "__prefab": { - "__id__": 243 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4856,11 +4869,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 206 }, "_enabled": false, "__prefab": { - "__id__": 245 + "__id__": 246 }, "_alignFlags": 44, "_target": null, @@ -4905,35 +4918,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 205 }, "_children": [ { - "__id__": 248 + "__id__": 249 }, { - "__id__": 256 + "__id__": 257 } ], "_active": true, "_components": [ { - "__id__": 282 + "__id__": 283 }, { - "__id__": 284 + "__id__": 285 }, { - "__id__": 286 + "__id__": 287 } ], "_prefab": { - "__id__": 288 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, - "y": 37.5, + "x": -105, + "y": 29.950000000000003, "z": 0 }, "_lrot": { @@ -4965,27 +4978,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 247 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 249 + "__id__": 250 }, { - "__id__": 251 + "__id__": 252 }, { - "__id__": 253 + "__id__": 254 } ], "_prefab": { - "__id__": 255 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", - "x": 100, + "x": 105, "y": 0, "z": 0 }, @@ -5018,15 +5031,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", - "width": 400, + "width": 420, "height": 110 }, "_anchorPoint": { @@ -5046,11 +5059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5094,11 +5107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 255 }, "_alignFlags": 45, "_target": null, @@ -5143,24 +5156,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 247 + "__id__": 248 }, "_children": [ { - "__id__": 257 + "__id__": 258 }, { - "__id__": 263 + "__id__": 264 } ], "_active": true, "_components": [ { - "__id__": 279 + "__id__": 280 } ], "_prefab": { - "__id__": 281 + "__id__": 282 }, "_lpos": { "__type__": "cc.Vec3", @@ -5197,20 +5210,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 256 + "__id__": 257 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 259 }, { - "__id__": 260 + "__id__": 261 } ], "_prefab": { - "__id__": 262 + "__id__": 263 }, "_lpos": { "__type__": "cc.Vec3", @@ -5247,11 +5260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", @@ -5275,11 +5288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5336,24 +5349,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 256 + "__id__": 257 }, "_children": [ { - "__id__": 264 + "__id__": 265 }, { - "__id__": 270 + "__id__": 271 } ], "_active": true, "_components": [ { - "__id__": 276 + "__id__": 277 } ], "_prefab": { - "__id__": 278 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -5390,20 +5403,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 266 }, { - "__id__": 267 + "__id__": 268 } ], "_prefab": { - "__id__": 269 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -5440,11 +5453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -5468,11 +5481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5549,20 +5562,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 272 }, { - "__id__": 273 + "__id__": 274 } ], "_prefab": { - "__id__": 275 + "__id__": 276 }, "_lpos": { "__type__": "cc.Vec3", @@ -5599,11 +5612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 271 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 273 }, "_contentSize": { "__type__": "cc.Size", @@ -5627,11 +5640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 271 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 275 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5708,11 +5721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 278 }, "_contentSize": { "__type__": "cc.Size", @@ -5749,11 +5762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -5790,15 +5803,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 210, "height": 50 }, "_anchorPoint": { @@ -5818,11 +5831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 248 }, "_enabled": false, "__prefab": { - "__id__": 285 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5863,11 +5876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 248 }, "_enabled": false, "__prefab": { - "__id__": 287 + "__id__": 288 }, "_alignFlags": 44, "_target": null, @@ -5912,35 +5925,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 205 }, "_children": [ { - "__id__": 290 + "__id__": 291 }, { - "__id__": 298 + "__id__": 299 } ], "_active": true, "_components": [ { - "__id__": 324 + "__id__": 325 }, { - "__id__": 326 + "__id__": 327 }, { - "__id__": 328 + "__id__": 329 } ], "_prefab": { - "__id__": 330 + "__id__": 331 }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, - "y": -37.5, + "x": 115, + "y": 29.950000000000003, "z": 0 }, "_lrot": { @@ -5972,27 +5985,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 290 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 292 }, { - "__id__": 293 + "__id__": 294 }, { - "__id__": 295 + "__id__": 296 } ], "_prefab": { - "__id__": 297 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", - "x": 100, + "x": 105, "y": 0, "z": 0 }, @@ -6025,15 +6038,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 293 }, "_contentSize": { "__type__": "cc.Size", - "width": 400, + "width": 420, "height": 110 }, "_anchorPoint": { @@ -6053,11 +6066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6101,11 +6114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 297 }, "_alignFlags": 45, "_target": null, @@ -6150,24 +6163,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 290 }, "_children": [ { - "__id__": 299 + "__id__": 300 }, { - "__id__": 305 + "__id__": 306 } ], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 322 } ], "_prefab": { - "__id__": 323 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -6204,20 +6217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 298 + "__id__": 299 }, "_children": [], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 301 }, { - "__id__": 302 + "__id__": 303 } ], "_prefab": { - "__id__": 304 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -6254,11 +6267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -6282,11 +6295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6343,24 +6356,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 298 + "__id__": 299 }, "_children": [ { - "__id__": 306 + "__id__": 307 }, { - "__id__": 312 + "__id__": 313 } ], "_active": true, "_components": [ { - "__id__": 318 + "__id__": 319 } ], "_prefab": { - "__id__": 320 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -6397,20 +6410,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 305 + "__id__": 306 }, "_children": [], "_active": true, "_components": [ { - "__id__": 307 + "__id__": 308 }, { - "__id__": 309 + "__id__": 310 } ], "_prefab": { - "__id__": 311 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -6447,11 +6460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -6475,11 +6488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 311 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6556,20 +6569,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 305 + "__id__": 306 }, "_children": [], "_active": true, "_components": [ { - "__id__": 313 + "__id__": 314 }, { - "__id__": 315 + "__id__": 316 } ], "_prefab": { - "__id__": 317 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", @@ -6606,11 +6619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -6634,11 +6647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6715,11 +6728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 320 }, "_contentSize": { "__type__": "cc.Size", @@ -6756,11 +6769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -6797,15 +6810,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 210, "height": 50 }, "_anchorPoint": { @@ -6825,11 +6838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 290 }, "_enabled": false, "__prefab": { - "__id__": 327 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6870,11 +6883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 290 }, "_enabled": false, "__prefab": { - "__id__": 329 + "__id__": 330 }, "_alignFlags": 44, "_target": null, @@ -6919,35 +6932,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 205 }, "_children": [ { - "__id__": 332 + "__id__": 333 }, { - "__id__": 340 + "__id__": 341 } ], "_active": true, "_components": [ { - "__id__": 366 + "__id__": 367 }, { - "__id__": 368 + "__id__": 369 }, { - "__id__": 370 + "__id__": 371 } ], "_prefab": { - "__id__": 372 + "__id__": 373 }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, - "y": -112.5, + "x": -325, + "y": -29.950000000000003, "z": 0 }, "_lrot": { @@ -6979,27 +6992,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 331 + "__id__": 332 }, "_children": [], "_active": true, "_components": [ { - "__id__": 333 + "__id__": 334 }, { - "__id__": 335 + "__id__": 336 }, { - "__id__": 337 + "__id__": 338 } ], "_prefab": { - "__id__": 339 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", - "x": 100, + "x": 105, "y": 0, "z": 0 }, @@ -7032,15 +7045,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", - "width": 400, + "width": 420, "height": 110 }, "_anchorPoint": { @@ -7060,11 +7073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7108,11 +7121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 332 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 339 }, "_alignFlags": 45, "_target": null, @@ -7157,24 +7170,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 331 + "__id__": 332 }, "_children": [ { - "__id__": 341 + "__id__": 342 }, { - "__id__": 347 + "__id__": 348 } ], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 364 } ], "_prefab": { - "__id__": 365 + "__id__": 366 }, "_lpos": { "__type__": "cc.Vec3", @@ -7211,20 +7224,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 340 + "__id__": 341 }, "_children": [], "_active": true, "_components": [ { - "__id__": 342 + "__id__": 343 }, { - "__id__": 344 + "__id__": 345 } ], "_prefab": { - "__id__": 346 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -7261,11 +7274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 341 + "__id__": 342 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 344 }, "_contentSize": { "__type__": "cc.Size", @@ -7289,11 +7302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 341 + "__id__": 342 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 346 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7350,24 +7363,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 340 + "__id__": 341 }, "_children": [ { - "__id__": 348 + "__id__": 349 }, { - "__id__": 354 + "__id__": 355 } ], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 361 } ], "_prefab": { - "__id__": 362 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -7404,20 +7417,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 347 + "__id__": 348 }, "_children": [], "_active": true, "_components": [ { - "__id__": 349 + "__id__": 350 }, { - "__id__": 351 + "__id__": 352 } ], "_prefab": { - "__id__": 353 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -7454,11 +7467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 351 }, "_contentSize": { "__type__": "cc.Size", @@ -7482,11 +7495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 353 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7563,20 +7576,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 347 + "__id__": 348 }, "_children": [], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 356 }, { - "__id__": 357 + "__id__": 358 } ], "_prefab": { - "__id__": 359 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -7613,11 +7626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -7641,11 +7654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 355 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 359 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7722,11 +7735,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 347 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7763,11 +7776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -7804,15 +7817,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 368 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 210, "height": 50 }, "_anchorPoint": { @@ -7832,11 +7845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 332 }, "_enabled": false, "__prefab": { - "__id__": 369 + "__id__": 370 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7877,11 +7890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 332 }, "_enabled": false, "__prefab": { - "__id__": 371 + "__id__": 372 }, "_alignFlags": 44, "_target": null, @@ -7926,16 +7939,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 275 + "width": 650, + "height": 109.9 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7954,17 +7967,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 377 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 120.393, + "_top": 371.348, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -7990,11 +8003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 379 }, "_resizeMode": 1, "_layoutType": 3, @@ -8009,7 +8022,7 @@ "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 10, - "_spacingY": 25, + "_spacingY": 9.9, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -8045,34 +8058,34 @@ }, "_children": [ { - "__id__": 381 + "__id__": 382 }, { - "__id__": 389 + "__id__": 390 }, { - "__id__": 397 + "__id__": 398 } ], "_active": true, "_components": [ { - "__id__": 401 + "__id__": 402 }, { - "__id__": 403 + "__id__": 404 }, { - "__id__": 405 + "__id__": 406 } ], "_prefab": { - "__id__": 407 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -166.442, "z": 0 }, "_lrot": { @@ -8104,23 +8117,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 381 }, "_children": [], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 383 }, { - "__id__": 384 + "__id__": 385 }, { - "__id__": 386 + "__id__": 387 } ], "_prefab": { - "__id__": 388 + "__id__": 389 }, "_lpos": { "__type__": "cc.Vec3", @@ -8157,16 +8170,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", "width": 1300, - "height": 590 + "height": 410 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8185,11 +8198,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8233,11 +8246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 388 }, "_alignFlags": 45, "_target": null, @@ -8282,28 +8295,28 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 381 }, "_children": [], "_active": true, "_components": [ { - "__id__": 390 + "__id__": 391 }, { - "__id__": 392 + "__id__": 393 }, { - "__id__": 394 + "__id__": 395 } ], "_prefab": { - "__id__": 396 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 135.577, + "y": 75.138, "z": 0 }, "_lrot": { @@ -8335,16 +8348,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 392 }, "_contentSize": { "__type__": "cc.Size", "width": -40, - "height": 100 + "height": 10 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8363,18 +8376,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 394 }, "_alignFlags": 45, "_target": null, "_left": 345, "_right": 345, - "_top": -40.57699999999999, - "_bottom": 230.577, + "_top": 19.862000000000002, + "_bottom": 170.138, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8399,11 +8412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 396 }, "_resizeMode": 1, "_layoutType": 1, @@ -8450,17 +8463,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 381 }, "_children": [], "_active": true, "_components": [ { - "__id__": 398 + "__id__": 399 } ], "_prefab": { - "__id__": 400 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -8497,11 +8510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 400 }, "_contentSize": { "__type__": "cc.Size", @@ -8538,16 +8551,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 403 }, "_contentSize": { "__type__": "cc.Size", "width": 650, - "height": 290 + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8566,18 +8579,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 405 }, "_alignFlags": 45, "_target": null, "_left": 30, "_right": 30, - "_top": 430, - "_bottom": 150, + "_top": 501.442, + "_bottom": 168.55800000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8602,11 +8615,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 381 }, "_enabled": false, "__prefab": { - "__id__": 406 + "__id__": 407 }, "_resizeMode": 1, "_layoutType": 3, @@ -8654,14 +8667,14 @@ "__id__": 88 }, "_prefab": { - "__id__": 409 + "__id__": 410 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 408 + "__id__": 409 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -8669,7 +8682,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 410 + "__id__": 411 }, "targetOverrides": null }, @@ -8681,23 +8694,20 @@ }, "mountedChildren": [ { - "__id__": 411 + "__id__": 412 }, { - "__id__": 471 + "__id__": 472 } ], "mountedComponents": [ { - "__id__": 482 + "__id__": 483 } ], "propertyOverrides": [ { - "__id__": 486 - }, - { - "__id__": 488 + "__id__": 487 }, { "__id__": 489 @@ -8709,46 +8719,46 @@ "__id__": 491 }, { - "__id__": 493 + "__id__": 492 }, { - "__id__": 495 + "__id__": 494 }, { - "__id__": 497 + "__id__": 496 }, { - "__id__": 499 + "__id__": 498 }, { "__id__": 500 }, { - "__id__": 502 + "__id__": 501 }, { - "__id__": 504 + "__id__": 503 }, { - "__id__": 506 + "__id__": 505 }, { - "__id__": 508 + "__id__": 507 }, { "__id__": 509 }, { - "__id__": 511 + "__id__": 510 }, { - "__id__": 513 + "__id__": 512 }, { - "__id__": 515 + "__id__": 514 }, { - "__id__": 517 + "__id__": 516 }, { "__id__": 518 @@ -8760,22 +8770,22 @@ "__id__": 520 }, { - "__id__": 522 + "__id__": 521 }, { - "__id__": 524 + "__id__": 523 }, { - "__id__": 526 + "__id__": 525 }, { "__id__": 527 }, { - "__id__": 529 + "__id__": 528 }, { - "__id__": 531 + "__id__": 530 }, { "__id__": 532 @@ -8784,7 +8794,10 @@ "__id__": 533 }, { - "__id__": 535 + "__id__": 534 + }, + { + "__id__": 536 } ], "removedComponents": [] @@ -8792,11 +8805,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 412 + "__id__": 413 }, "nodes": [ { - "__id__": 413 + "__id__": 414 } ] }, @@ -8810,14 +8823,14 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 414 + "__id__": 415 }, "_prefab": { - "__id__": 464 + "__id__": 465 }, "__editorExtras__": { "mountedRoot": { - "__id__": 408 + "__id__": 409 } } }, @@ -8829,30 +8842,30 @@ "mountedRoot": null }, "_parent": { - "__id__": 415 + "__id__": 416 }, "_children": [ { - "__id__": 447 + "__id__": 448 }, { - "__id__": 453 + "__id__": 454 }, { - "__id__": 413 + "__id__": 414 } ], "_active": true, "_components": [ { - "__id__": 459 + "__id__": 460 }, { - "__id__": 461 + "__id__": 462 } ], "_prefab": { - "__id__": 463 + "__id__": 464 }, "_lpos": { "__type__": "cc.Vec3", @@ -8889,33 +8902,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 408 + "__id__": 409 }, "_children": [ { - "__id__": 414 + "__id__": 415 }, { - "__id__": 416 + "__id__": 417 }, { - "__id__": 434 + "__id__": 435 } ], "_active": true, "_components": [ { - "__id__": 440 + "__id__": 441 }, { - "__id__": 442 + "__id__": 443 }, { - "__id__": 444 + "__id__": 445 } ], "_prefab": { - "__id__": 446 + "__id__": 447 }, "_lpos": { "__type__": "cc.Vec3", @@ -8954,27 +8967,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 415 + "__id__": 416 }, "_children": [ { - "__id__": 417 + "__id__": 418 }, { - "__id__": 423 + "__id__": 424 } ], "_active": false, "_components": [ { - "__id__": 429 + "__id__": 430 }, { - "__id__": 431 + "__id__": 432 } ], "_prefab": { - "__id__": 433 + "__id__": 434 }, "_lpos": { "__type__": "cc.Vec3", @@ -9011,20 +9024,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 416 + "__id__": 417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 418 + "__id__": 419 }, { - "__id__": 420 + "__id__": 421 } ], "_prefab": { - "__id__": 422 + "__id__": 423 }, "_lpos": { "__type__": "cc.Vec3", @@ -9061,11 +9074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 420 }, "_contentSize": { "__type__": "cc.Size", @@ -9089,11 +9102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 422 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9150,20 +9163,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 416 + "__id__": 417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 424 + "__id__": 425 }, { - "__id__": 426 + "__id__": 427 } ], "_prefab": { - "__id__": 428 + "__id__": 429 }, "_lpos": { "__type__": "cc.Vec3", @@ -9200,11 +9213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -9228,11 +9241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 428 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9309,11 +9322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 431 }, "_contentSize": { "__type__": "cc.Size", @@ -9337,11 +9350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 433 }, "_resizeMode": 1, "_layoutType": 1, @@ -9390,20 +9403,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 415 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 435 + "__id__": 436 }, { - "__id__": 437 + "__id__": 438 } ], "_prefab": { - "__id__": 439 + "__id__": 440 }, "_lpos": { "__type__": "cc.Vec3", @@ -9440,11 +9453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -9468,11 +9481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9549,11 +9562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 442 }, "_contentSize": { "__type__": "cc.Size", @@ -9577,11 +9590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 444 }, "_alignFlags": 45, "_target": null, @@ -9613,11 +9626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 446 }, "_resizeMode": 1, "_layoutType": 2, @@ -9664,20 +9677,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 414 + "__id__": 415 }, "_children": [], "_active": false, "_components": [ { - "__id__": 448 + "__id__": 449 }, { - "__id__": 450 + "__id__": 451 } ], "_prefab": { - "__id__": 452 + "__id__": 453 }, "_lpos": { "__type__": "cc.Vec3", @@ -9714,11 +9727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 450 }, "_contentSize": { "__type__": "cc.Size", @@ -9742,11 +9755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 452 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9800,20 +9813,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 414 + "__id__": 415 }, "_children": [], "_active": true, "_components": [ { - "__id__": 454 + "__id__": 455 }, { - "__id__": 456 + "__id__": 457 } ], "_prefab": { - "__id__": 458 + "__id__": 459 }, "_lpos": { "__type__": "cc.Vec3", @@ -9850,11 +9863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 454 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 456 }, "_contentSize": { "__type__": "cc.Size", @@ -9878,11 +9891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 454 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 458 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9959,11 +9972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 460 + "__id__": 461 }, "_contentSize": { "__type__": "cc.Size", @@ -9987,11 +10000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 462 + "__id__": 463 }, "_resizeMode": 1, "_layoutType": 1, @@ -10035,7 +10048,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 413 + "__id__": 414 }, "asset": { "__uuid__": "4b8fb686-b649-4525-9aae-df0e7369205b", @@ -10043,7 +10056,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 465 + "__id__": 466 }, "targetOverrides": null }, @@ -10057,16 +10070,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 466 - }, - { - "__id__": 468 + "__id__": 467 }, { "__id__": 469 }, { "__id__": 470 + }, + { + "__id__": 471 } ], "removedComponents": [] @@ -10074,7 +10087,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 468 }, "propertyPath": [ "_name" @@ -10090,7 +10103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 468 }, "propertyPath": [ "_lpos" @@ -10105,7 +10118,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 468 }, "propertyPath": [ "_lrot" @@ -10121,7 +10134,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 468 }, "propertyPath": [ "_euler" @@ -10136,11 +10149,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 472 + "__id__": 473 }, "nodes": [ { - "__id__": 473 + "__id__": 474 } ] }, @@ -10154,21 +10167,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 408 + "__id__": 409 }, "_prefab": { - "__id__": 474 + "__id__": 475 }, "__editorExtras__": { "mountedRoot": { - "__id__": 408 + "__id__": 409 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 473 + "__id__": 474 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -10176,7 +10189,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 475 + "__id__": 476 }, "targetOverrides": null }, @@ -10190,10 +10203,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 476 - }, - { - "__id__": 478 + "__id__": 477 }, { "__id__": 479 @@ -10203,6 +10213,9 @@ }, { "__id__": 481 + }, + { + "__id__": 482 } ], "removedComponents": [] @@ -10210,7 +10223,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 477 + "__id__": 478 }, "propertyPath": [ "_name" @@ -10226,7 +10239,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 477 + "__id__": 478 }, "propertyPath": [ "_lpos" @@ -10241,7 +10254,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 477 + "__id__": 478 }, "propertyPath": [ "_lrot" @@ -10257,7 +10270,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 477 + "__id__": 478 }, "propertyPath": [ "_euler" @@ -10272,7 +10285,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 477 + "__id__": 478 }, "propertyPath": [ "_active" @@ -10282,11 +10295,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 483 + "__id__": 484 }, "components": [ { - "__id__": 484 + "__id__": 485 } ] }, @@ -10302,15 +10315,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 408 + "__id__": 409 } }, "node": { - "__id__": 408 + "__id__": 409 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 486 }, "_alignFlags": 4, "_target": null, @@ -10339,7 +10352,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 488 }, "propertyPath": [ "_name" @@ -10355,7 +10368,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 488 }, "propertyPath": [ "_lpos" @@ -10370,7 +10383,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 488 }, "propertyPath": [ "_lrot" @@ -10386,7 +10399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 488 }, "propertyPath": [ "_euler" @@ -10401,7 +10414,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 492 + "__id__": 493 }, "propertyPath": [ "_contentSize" @@ -10421,7 +10434,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 494 + "__id__": 495 }, "propertyPath": [ "_contentSize" @@ -10441,7 +10454,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 496 + "__id__": 497 }, "propertyPath": [ "_contentSize" @@ -10461,7 +10474,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 498 + "__id__": 499 }, "propertyPath": [ "_top" @@ -10477,7 +10490,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 498 + "__id__": 499 }, "propertyPath": [ "_bottom" @@ -10487,7 +10500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 501 + "__id__": 502 }, "propertyPath": [ "_string" @@ -10503,7 +10516,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 503 + "__id__": 504 }, "propertyPath": [ "_contentSize" @@ -10523,7 +10536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 505 + "__id__": 506 }, "propertyPath": [ "_name" @@ -10539,7 +10552,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 508 }, "propertyPath": [ "_spriteFrame" @@ -10558,7 +10571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 508 }, "propertyPath": [ "_atlas" @@ -10571,7 +10584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 510 + "__id__": 511 }, "propertyPath": [ "_spacingY" @@ -10587,7 +10600,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 513 }, "propertyPath": [ "_lpos" @@ -10608,7 +10621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 515 }, "propertyPath": [ "_lpos" @@ -10629,7 +10642,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 516 + "__id__": 517 }, "propertyPath": [ "_lpos" @@ -10650,7 +10663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 501 + "__id__": 502 }, "propertyPath": [ "_lineHeight" @@ -10660,7 +10673,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 501 + "__id__": 502 }, "propertyPath": [ "_fontSize" @@ -10670,7 +10683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 501 + "__id__": 502 }, "propertyPath": [ "_actualFontSize" @@ -10680,7 +10693,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 522 }, "propertyPath": [ "_lpos" @@ -10701,7 +10714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 523 + "__id__": 524 }, "propertyPath": [ "_lpos" @@ -10722,7 +10735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 525 + "__id__": 526 }, "propertyPath": [ "_contentSize" @@ -10742,7 +10755,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 522 }, "propertyPath": [ "_active" @@ -10752,7 +10765,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 529 }, "propertyPath": [ "_fontSize" @@ -10768,7 +10781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 530 + "__id__": 531 }, "propertyPath": [ "_contentSize" @@ -10788,7 +10801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 529 }, "propertyPath": [ "_actualFontSize" @@ -10798,7 +10811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 529 }, "propertyPath": [ "_string" @@ -10808,7 +10821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 534 + "__id__": 535 }, "propertyPath": [ "_horizontalDirection" @@ -10824,7 +10837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 534 + "__id__": 535 }, "propertyPath": [ "_spacingX" @@ -10841,7 +10854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -10869,7 +10882,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 540 }, "_alignFlags": 45, "_target": null, @@ -10918,20 +10931,20 @@ }, "_children": [ { - "__id__": 542 + "__id__": 543 } ], "_active": true, "_components": [ { - "__id__": 550 + "__id__": 551 }, { - "__id__": 552 + "__id__": 553 } ], "_prefab": { - "__id__": 554 + "__id__": 555 }, "_lpos": { "__type__": "cc.Vec3", @@ -10968,23 +10981,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 541 + "__id__": 542 }, "_children": [], "_active": true, "_components": [ { - "__id__": 543 + "__id__": 544 }, { - "__id__": 545 + "__id__": 546 }, { - "__id__": 547 + "__id__": 548 } ], "_prefab": { - "__id__": 549 + "__id__": 550 }, "_lpos": { "__type__": "cc.Vec3", @@ -11021,11 +11034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -11049,11 +11062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 546 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11097,11 +11110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 548 + "__id__": 549 }, "_alignFlags": 45, "_target": null, @@ -11146,11 +11159,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 552 }, "_contentSize": { "__type__": "cc.Size", @@ -11174,11 +11187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 554 }, "_alignFlags": 44, "_target": null, @@ -11227,20 +11240,20 @@ }, "_children": [ { - "__id__": 556 + "__id__": 557 } ], "_active": true, "_components": [ { - "__id__": 648 + "__id__": 649 }, { - "__id__": 650 + "__id__": 651 } ], "_prefab": { - "__id__": 652 + "__id__": 653 }, "_lpos": { "__type__": "cc.Vec3", @@ -11277,33 +11290,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 555 + "__id__": 556 }, "_children": [ { - "__id__": 557 + "__id__": 558 }, { - "__id__": 575 + "__id__": 576 } ], "_active": true, "_components": [ { - "__id__": 641 + "__id__": 642 }, { - "__id__": 643 + "__id__": 644 }, { - "__id__": 572 + "__id__": 573 }, { - "__id__": 645 + "__id__": 646 } ], "_prefab": { - "__id__": 647 + "__id__": 648 }, "_lpos": { "__type__": "cc.Vec3", @@ -11340,30 +11353,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 557 }, "_children": [ { - "__id__": 558 + "__id__": 559 } ], "_active": false, "_components": [ { - "__id__": 564 + "__id__": 565 }, { - "__id__": 566 + "__id__": 567 }, { - "__id__": 568 + "__id__": 569 }, { - "__id__": 570 + "__id__": 571 } ], "_prefab": { - "__id__": 640 + "__id__": 641 }, "_lpos": { "__type__": "cc.Vec3", @@ -11400,20 +11413,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 557 + "__id__": 558 }, "_children": [], "_active": true, "_components": [ { - "__id__": 559 + "__id__": 560 }, { - "__id__": 561 + "__id__": 562 } ], "_prefab": { - "__id__": 563 + "__id__": 564 }, "_lpos": { "__type__": "cc.Vec3", @@ -11450,11 +11463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 559 }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 561 }, "_contentSize": { "__type__": "cc.Size", @@ -11478,11 +11491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 559 }, "_enabled": true, "__prefab": { - "__id__": 562 + "__id__": 563 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11536,11 +11549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 566 }, "_contentSize": { "__type__": "cc.Size", @@ -11564,11 +11577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 568 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11609,11 +11622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 570 }, "_alignFlags": 37, "_target": null, @@ -11645,17 +11658,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 571 - }, - "_scrollView": { "__id__": 572 }, + "_scrollView": { + "__id__": 573 + }, "_handle": { - "__id__": 561 + "__id__": 562 }, "_direction": 1, "_enableAutoHide": false, @@ -11672,11 +11685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 574 }, "bounceDuration": 0.23, "brake": 0.75, @@ -11687,11 +11700,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 574 + "__id__": 575 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 570 + "__id__": 571 }, "_id": "" }, @@ -11705,42 +11718,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 575 + "__id__": 576 }, "_children": [ { - "__id__": 585 + "__id__": 586 }, { - "__id__": 593 + "__id__": 594 }, { - "__id__": 601 + "__id__": 602 }, { - "__id__": 609 + "__id__": 610 }, { - "__id__": 617 + "__id__": 618 }, { - "__id__": 625 + "__id__": 626 } ], "_active": true, "_components": [ { - "__id__": 633 + "__id__": 634 }, { - "__id__": 635 + "__id__": 636 }, { - "__id__": 637 + "__id__": 638 } ], "_prefab": { - "__id__": 639 + "__id__": 640 }, "_lpos": { "__type__": "cc.Vec3", @@ -11777,30 +11790,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 557 }, "_children": [ { - "__id__": 574 + "__id__": 575 } ], "_active": true, "_components": [ { - "__id__": 576 + "__id__": 577 }, { - "__id__": 578 + "__id__": 579 }, { - "__id__": 580 + "__id__": 581 }, { - "__id__": 582 + "__id__": 583 } ], "_prefab": { - "__id__": 584 + "__id__": 585 }, "_lpos": { "__type__": "cc.Vec3", @@ -11837,11 +11850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 577 + "__id__": 578 }, "_contentSize": { "__type__": "cc.Size", @@ -11865,11 +11878,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 580 }, "_type": 0, "_inverted": false, @@ -11887,11 +11900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 582 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11933,11 +11946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 583 + "__id__": 584 }, "_alignFlags": 45, "_target": null, @@ -11980,17 +11993,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 586 + "__id__": 587 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 585 + "__id__": 586 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -11998,7 +12011,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 587 + "__id__": 588 }, "targetOverrides": null }, @@ -12012,16 +12025,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 588 - }, - { - "__id__": 590 + "__id__": 589 }, { "__id__": 591 }, { "__id__": 592 + }, + { + "__id__": 593 } ], "removedComponents": [] @@ -12029,7 +12042,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 590 }, "propertyPath": [ "_name" @@ -12045,7 +12058,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 590 }, "propertyPath": [ "_lpos" @@ -12060,7 +12073,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 590 }, "propertyPath": [ "_lrot" @@ -12076,7 +12089,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 590 }, "propertyPath": [ "_euler" @@ -12092,17 +12105,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 594 + "__id__": 595 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 593 + "__id__": 594 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12110,7 +12123,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 595 + "__id__": 596 }, "targetOverrides": null }, @@ -12124,16 +12137,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 596 - }, - { - "__id__": 598 + "__id__": 597 }, { "__id__": 599 }, { "__id__": 600 + }, + { + "__id__": 601 } ], "removedComponents": [] @@ -12141,7 +12154,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 598 }, "propertyPath": [ "_name" @@ -12157,7 +12170,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 598 }, "propertyPath": [ "_lpos" @@ -12172,7 +12185,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 598 }, "propertyPath": [ "_lrot" @@ -12188,7 +12201,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 598 }, "propertyPath": [ "_euler" @@ -12204,17 +12217,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 602 + "__id__": 603 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 601 + "__id__": 602 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12222,7 +12235,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 603 + "__id__": 604 }, "targetOverrides": null }, @@ -12236,16 +12249,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 604 - }, - { - "__id__": 606 + "__id__": 605 }, { "__id__": 607 }, { "__id__": 608 + }, + { + "__id__": 609 } ], "removedComponents": [] @@ -12253,7 +12266,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 605 + "__id__": 606 }, "propertyPath": [ "_name" @@ -12269,7 +12282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 605 + "__id__": 606 }, "propertyPath": [ "_lpos" @@ -12284,7 +12297,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 605 + "__id__": 606 }, "propertyPath": [ "_lrot" @@ -12300,7 +12313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 605 + "__id__": 606 }, "propertyPath": [ "_euler" @@ -12316,17 +12329,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 610 + "__id__": 611 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 609 + "__id__": 610 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12334,7 +12347,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 611 + "__id__": 612 }, "targetOverrides": null }, @@ -12348,16 +12361,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 612 - }, - { - "__id__": 614 + "__id__": 613 }, { "__id__": 615 }, { "__id__": 616 + }, + { + "__id__": 617 } ], "removedComponents": [] @@ -12365,7 +12378,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 614 }, "propertyPath": [ "_name" @@ -12381,7 +12394,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 614 }, "propertyPath": [ "_lpos" @@ -12396,7 +12409,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 614 }, "propertyPath": [ "_lrot" @@ -12412,7 +12425,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 614 }, "propertyPath": [ "_euler" @@ -12428,17 +12441,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 618 + "__id__": 619 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 617 + "__id__": 618 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12446,7 +12459,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 619 + "__id__": 620 }, "targetOverrides": null }, @@ -12460,16 +12473,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 620 - }, - { - "__id__": 622 + "__id__": 621 }, { "__id__": 623 }, { "__id__": 624 + }, + { + "__id__": 625 } ], "removedComponents": [] @@ -12477,7 +12490,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 621 + "__id__": 622 }, "propertyPath": [ "_name" @@ -12493,7 +12506,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 621 + "__id__": 622 }, "propertyPath": [ "_lpos" @@ -12508,7 +12521,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 621 + "__id__": 622 }, "propertyPath": [ "_lrot" @@ -12524,7 +12537,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 621 + "__id__": 622 }, "propertyPath": [ "_euler" @@ -12540,17 +12553,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 574 + "__id__": 575 }, "_prefab": { - "__id__": 626 + "__id__": 627 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 625 + "__id__": 626 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12558,7 +12571,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 627 + "__id__": 628 }, "targetOverrides": null }, @@ -12572,16 +12585,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 628 - }, - { - "__id__": 630 + "__id__": 629 }, { "__id__": 631 }, { "__id__": 632 + }, + { + "__id__": 633 } ], "removedComponents": [] @@ -12589,7 +12602,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_name" @@ -12605,7 +12618,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_lpos" @@ -12620,7 +12633,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_lrot" @@ -12636,7 +12649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_euler" @@ -12654,11 +12667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 635 }, "_contentSize": { "__type__": "cc.Size", @@ -12682,11 +12695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 637 }, "_alignFlags": 13, "_target": null, @@ -12718,11 +12731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 639 }, "_resizeMode": 0, "_layoutType": 1, @@ -12782,11 +12795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 643 }, "_contentSize": { "__type__": "cc.Size", @@ -12810,11 +12823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 557 }, "_enabled": false, "__prefab": { - "__id__": 644 + "__id__": 645 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12855,11 +12868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 647 }, "_alignFlags": 45, "_target": null, @@ -12904,11 +12917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 649 + "__id__": 650 }, "_contentSize": { "__type__": "cc.Size", @@ -12932,11 +12945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 651 + "__id__": 652 }, "_alignFlags": 44, "_target": null, @@ -12985,7 +12998,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 654 + "__id__": 655 }, "_contentSize": { "__type__": "cc.Size", @@ -13013,7 +13026,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 657 }, "_alignFlags": 45, "_target": null, @@ -13049,59 +13062,59 @@ }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 659 }, "hero_icon": { "__id__": 90 }, "ap_node": { - "__id__": 270 + "__id__": 271 }, "def_node": { - "__id__": 354 + "__id__": 355 }, "hp_node": { - "__id__": 312 + "__id__": 313 }, "cd_node": { - "__id__": 228 + "__id__": 229 }, "BG_node": { "__id__": 2 }, "info_node": { - "__id__": 389 + "__id__": 390 }, "name_node": { - "__id__": 122 + "__id__": 123 }, "cards_node": { - "__id__": 574 + "__id__": 575 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", "__expectedType__": "cc.Prefab" }, "lv_label": { - "__id__": 136 + "__id__": 137 }, "type_node": { - "__id__": 139 + "__id__": 140 }, "upgrade_btn": { - "__id__": 408 + "__id__": 409 }, "fragment_node": { - "__id__": 453 + "__id__": 454 }, "chip_node": { - "__id__": 413 + "__id__": 414 }, "infos_node": { - "__id__": 397 + "__id__": 398 }, "skills_node": { - "__id__": 389 + "__id__": 390 }, "skill_icon_prefab": { "__uuid__": "c887ba55-bb80-4c4b-b0e1-0d265b3f58e0", @@ -13126,7 +13139,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 661 }, "_id": "" }, @@ -13146,36 +13159,36 @@ "instance": null, "targetOverrides": [ { - "__id__": 662 + "__id__": 663 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 625 + "__id__": 626 }, { - "__id__": 617 + "__id__": 618 }, { - "__id__": 609 + "__id__": 610 }, { - "__id__": 601 + "__id__": 602 }, { - "__id__": 593 + "__id__": 594 }, { - "__id__": 585 + "__id__": 586 }, { - "__id__": 408 + "__id__": 409 }, { - "__id__": 473 + "__id__": 474 }, { - "__id__": 413 + "__id__": 414 }, { "__id__": 105 @@ -13200,17 +13213,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 657 + "__id__": 658 }, "sourceInfo": null, "propertyPath": [ "fragment_node" ], "target": { - "__id__": 408 + "__id__": 409 }, "targetInfo": { - "__id__": 663 + "__id__": 664 } }, { diff --git a/assets/resources/gui/element/prefab_talent_item.prefab b/assets/resources/gui/element/prefab_talent_item.prefab index f6e3d5d6..8604929b 100644 --- a/assets/resources/gui/element/prefab_talent_item.prefab +++ b/assets/resources/gui/element/prefab_talent_item.prefab @@ -22,32 +22,41 @@ "__id__": 2 }, { - "__id__": 63 + "__id__": 107 }, { - "__id__": 69 + "__id__": 113 }, { - "__id__": 75 + "__id__": 119 }, { - "__id__": 81 + "__id__": 125 + }, + { + "__id__": 131 + }, + { + "__id__": 181 + }, + { + "__id__": 187 } ], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 197 }, { - "__id__": 89 + "__id__": 199 }, { - "__id__": 91 + "__id__": 201 } ], "_prefab": { - "__id__": 93 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -211,6 +220,87 @@ }, { "__id__": 61 + }, + { + "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 + }, + { + "__id__": 69 + }, + { + "__id__": 71 + }, + { + "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 77 + }, + { + "__id__": 79 + }, + { + "__id__": 81 + }, + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 96 + }, + { + "__id__": 98 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + }, + { + "__id__": 102 + }, + { + "__id__": 103 + }, + { + "__id__": 104 + }, + { + "__id__": 105 + }, + { + "__id__": 106 } ], "removedComponents": [] @@ -425,8 +515,8 @@ ], "value": { "__type__": "cc.Size", - "width": 190, - "height": 140 + "width": 200, + "height": 100 } }, { @@ -446,7 +536,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -466,8 +556,8 @@ ], "value": { "__type__": "cc.Size", - "width": 380, - "height": 280 + "width": 400, + "height": 200 } }, { @@ -602,8 +692,8 @@ ], "value": { "__type__": "cc.Size", - "width": 190, - "height": 140 + "width": 200, + "height": 100 } }, { @@ -623,7 +713,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -643,8 +733,8 @@ ], "value": { "__type__": "cc.Size", - "width": 380, - "height": 280 + "width": 400, + "height": 200 } }, { @@ -739,8 +829,8 @@ ], "value": { "__type__": "cc.Size", - "width": 190, - "height": 140 + "width": 200, + "height": 100 } }, { @@ -760,7 +850,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 75, "z": 0 } }, @@ -780,8 +870,8 @@ ], "value": { "__type__": "cc.Size", - "width": 380, - "height": 280 + "width": 400, + "height": 200 } }, { @@ -790,6 +880,428 @@ "1dy2U4eNdI6KgBqcoGyOOb" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 64 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 220, + "height": 270 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c7P3FATx1Dfq6aOzERRays" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 66 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 440, + "height": 540 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0aPrZjJQVGvL+VQ7yPK3dH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 68 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 432, + "height": 528 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "90Lx7iNX1GZIPvb+Ojrt7/" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 70 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 200, + "height": 100 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c6jYrmFHpFp6RuWDe67G2G" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 72 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "56FOKGz8tPS4JmNM8TIzUV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 74 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 400, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "43wqVuSZVKkJTwH+fEl01R" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 76 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 220, + "height": 270 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "93CBiNYttN5oi4bGIdT2Lj" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 78 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 440, + "height": 540 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9aZ8oxWlFJo5iWPbaiQSeR" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 80 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 432, + "height": 528 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3deBLA7NpFEYPS3ajIMhmM" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 82 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 200, + "height": 100 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "7biZFroZpG/LoDVwYqHehV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 84 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a8DENPFY1El5WB9YEMoGa1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 86 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 400, + "height": 200 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "24px4OQkBIL72ljsq+nxBh" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 88 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "77fSbliXxNcoaNXvMvjdaV" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 88 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 91 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "76WhE/6whGdZK+fHJkwPjZ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 91 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aa+is4KL9Lx54TRrdz7Kfo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 97 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6cEYFVhAlE7YChUIh15Sqo" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 97 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 + }, + "propertyPath": [ + "_left" + ], + "value": 10 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "96qO7fe1hJYZqKOH9rENl6" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 + }, + "propertyPath": [ + "_right" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_top" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 97 + }, + "propertyPath": [ + "_top" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 88 + }, + "propertyPath": [ + "_top" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 91 + }, + "propertyPath": [ + "_top" + ], + "value": 10 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 + }, + "propertyPath": [ + "_top" + ], + "value": 10 + }, { "__type__": "cc.Node", "_name": "icon", @@ -802,19 +1314,19 @@ "_active": true, "_components": [ { - "__id__": 64 + "__id__": 108 }, { - "__id__": 66 + "__id__": 110 } ], "_prefab": { - "__id__": 68 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 63.544, + "y": 57.199, "z": 0 }, "_lrot": { @@ -846,11 +1358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -874,11 +1386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 111 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -935,19 +1447,19 @@ "_active": true, "_components": [ { - "__id__": 70 + "__id__": 114 }, { - "__id__": 72 + "__id__": 116 } ], "_prefab": { - "__id__": 74 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0.087, + "y": 9.293, "z": 0 }, "_lrot": { @@ -979,11 +1491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -1007,11 +1519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1094,19 +1606,19 @@ "_active": true, "_components": [ { - "__id__": 76 + "__id__": 120 }, { - "__id__": 78 + "__id__": 122 } ], "_prefab": { - "__id__": 80 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -75.304, + "y": -54.456, "z": 0 }, "_lrot": { @@ -1138,11 +1650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -1166,11 +1678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1250,22 +1762,22 @@ "__id__": 1 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 82 + "__id__": 126 }, { - "__id__": 84 + "__id__": 128 } ], "_prefab": { - "__id__": 86 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 94.777, + "x": 71.202, + "y": -103.682, "z": 0 }, "_lrot": { @@ -1297,16 +1809,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", - "width": 67.90380859375, - "height": 54.4 + "width": 59.60546875, + "height": 67 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1325,11 +1837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1341,13 +1853,13 @@ "b": 255, "a": 255 }, - "_string": "等级0", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, + "_string": "0/9", + "_horizontalAlign": 2, + "_verticalAlign": 2, + "_actualFontSize": 40, + "_fontSize": 40, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 50, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -1400,6 +1912,1507 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "locked", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 132 + }, + { + "__id__": 170 + } + ], + "_active": true, + "_components": [ + { + "__id__": 176 + }, + { + "__id__": 178 + } + ], + "_prefab": { + "__id__": 180 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 131 + }, + "_children": [ + { + "__id__": 133 + }, + { + "__id__": 141 + }, + { + "__id__": 149 + } + ], + "_active": true, + "_components": [ + { + "__id__": 163 + }, + { + "__id__": 165 + }, + { + "__id__": 167 + } + ], + "_prefab": { + "__id__": 169 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "CardFrame03_n_Bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 132 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 134 + }, + { + "__id__": 136 + }, + { + "__id__": 138 + } + ], + "_prefab": { + "__id__": 140 + }, + "_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.5, + "y": 0.5, + "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__": 133 + }, + "_enabled": true, + "__prefab": { + "__id__": 135 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 440, + "height": 540 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5be8Y5xQhIcqiqfRHSUXyi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 133 + }, + "_enabled": true, + "__prefab": { + "__id__": 137 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 219, + "g": 219, + "b": 219, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@8ed5b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "310faVhipED5Lh7lfM4nhW" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 133 + }, + "_enabled": true, + "__prefab": { + "__id__": 139 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 64, + "_originalHeight": 67, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a9Kib45E5Ly4BqLAyJgFqs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7eufRQtqJH0Y8Q7oM6jxzB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "CardFrame03_n_Light", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 132 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 142 + }, + { + "__id__": 144 + }, + { + "__id__": 146 + } + ], + "_prefab": { + "__id__": 148 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 1, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 143 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 432, + "height": 528 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63icpebARPmZdNwGVUCIiD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 145 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 192, + "g": 192, + "b": 192, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@6c895", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "53mKGd3ZZMPKOo5r6SXHHI" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 141 + }, + "_enabled": true, + "__prefab": { + "__id__": 147 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 4, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 56, + "_originalHeight": 56, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aeN4BCs8BFn6JGBQDoks3G" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "24mHO9vIVM+aym0IYHM5JA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "InnerBg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 132 + }, + "_children": [ + { + "__id__": 150 + } + ], + "_active": true, + "_components": [ + { + "__id__": 158 + }, + { + "__id__": 160 + } + ], + "_prefab": { + "__id__": 162 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 75, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "CardFrame03_n_InnerBg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 149 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 151 + }, + { + "__id__": 153 + }, + { + "__id__": 155 + } + ], + "_prefab": { + "__id__": 157 + }, + "_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.5, + "y": 0.5, + "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__": 150 + }, + "_enabled": true, + "__prefab": { + "__id__": 152 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 400, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7efwATyvxPY7HpQChcjxWf" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 150 + }, + "_enabled": true, + "__prefab": { + "__id__": 154 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 214, + "g": 208, + "b": 208, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e230b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "41kw9SQVBKmpbV5y6u5kGF" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 150 + }, + "_enabled": true, + "__prefab": { + "__id__": 156 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36SD0VKG1Hv7kFjGnvcOAf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "89RPBgXm9GJKp1XWS3504D", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 149 + }, + "_enabled": true, + "__prefab": { + "__id__": 159 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d3C2H7ChhPlr18iWhAuLSl" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 149 + }, + "_enabled": true, + "__prefab": { + "__id__": 161 + }, + "_alignFlags": 41, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 10, + "_bottom": 115, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "50PKr8i0NJp5LdefQZlejW" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "44RQ+l7uRCMYmJHreY/8B0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 164 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 270 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "90eS59g8VFsphYkfjOxOqC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 166 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 168 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "16E7xoqaVFeITmFL140HoK" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 168 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 228, + "_originalHeight": 293, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "45AGWwyMVAD4/jKp5hBptl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "79SWDtvqBI7rdSoa3dC4Rx", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Icon_Lock03", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 131 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 171 + }, + { + "__id__": 173 + } + ], + "_prefab": { + "__id__": 175 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.5, + "y": 1.5, + "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__": 170 + }, + "_enabled": true, + "__prefab": { + "__id__": 172 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 71, + "height": 93 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "96CNC5WcxHCLj/0rraN4ac" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 170 + }, + "_enabled": true, + "__prefab": { + "__id__": 174 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@cebb2", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2OtALK6NGW4VjKFngrgE6" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8dVVuSmoNM8LK80ldyL0K7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 131 + }, + "_enabled": true, + "__prefab": { + "__id__": 177 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 270 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03bDF6oNhLoLvrNLXtlHMk" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 131 + }, + "_enabled": true, + "__prefab": { + "__id__": 179 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4exW/pMVhNO7eORwt60jHu" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d568jl8ZNHl6fij+8UbiPC", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "plus", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 182 + }, + { + "__id__": 184 + } + ], + "_prefab": { + "__id__": 186 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 101.703, + "y": 107.847, + "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__": 181 + }, + "_enabled": true, + "__prefab": { + "__id__": 183 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 81, + "height": 85 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2cBRMszR5Gya6b3iMZCaWj" + }, + { + "__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": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@96977", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b1ycugg2FKdoKccP5eYqCb" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0tljJoRdN7KaClR83qq9p", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "max", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 188 + } + ], + "_active": true, + "_components": [ + { + "__id__": 194 + } + ], + "_prefab": { + "__id__": 196 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -67.96, + "y": 109.163, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 187 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 189 + }, + { + "__id__": 191 + } + ], + "_prefab": { + "__id__": 193 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48.443359375, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e97XUATdhLwouRznzgnMwd" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 192 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "MAX", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35SquuE8hPc6gamIxpkdDr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b6U+PsPDBCCZg7VSjzAza9", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 187 + }, + "_enabled": true, + "__prefab": { + "__id__": 195 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71KYAwADNI7bohCRDrH8jB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2cU2OdTPNBXZVGh54ER33t", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1410,7 +3423,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -1438,7 +3451,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 90 + "__id__": 200 }, "_alignFlags": 40, "_target": null, @@ -1474,18 +3487,30 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 202 }, "lbl_name": { - "__id__": 72 + "__id__": 116 }, "lbl_info": { - "__id__": 78 + "__id__": 122 + }, + "lbl_lv": { + "__id__": 128 }, "icon": { - "__id__": 66 + "__id__": 110 }, "bg": null, + "node_plus": { + "__id__": 181 + }, + "node_max": { + "__id__": 187 + }, + "node_lock": { + "__id__": 131 + }, "_id": "" }, { @@ -1504,7 +3529,7 @@ "instance": null, "targetOverrides": [ { - "__id__": 94 + "__id__": 204 } ], "nestedPrefabInstanceRoots": [ @@ -1515,9 +3540,7 @@ }, { "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 91 - }, + "source": null, "sourceInfo": null, "propertyPath": [ "bg" @@ -1526,7 +3549,7 @@ "__id__": 2 }, "targetInfo": { - "__id__": 95 + "__id__": 205 } }, { diff --git a/assets/resources/gui/element/sibox.prefab b/assets/resources/gui/element/sibox.prefab index 9d721375..9f88c9ce 100644 --- a/assets/resources/gui/element/sibox.prefab +++ b/assets/resources/gui/element/sibox.prefab @@ -3246,7 +3246,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": false, + "_useGrayscale": true, "_atlas": null, "_id": "" }, diff --git a/assets/resources/gui/element/talents.prefab b/assets/resources/gui/element/talents.prefab index f3f66560..17472b2a 100644 --- a/assets/resources/gui/element/talents.prefab +++ b/assets/resources/gui/element/talents.prefab @@ -1537,6 +1537,14 @@ "__uuid__": "a0cdb31c-0abb-4e12-9dfe-0bd9e8cd7272", "__expectedType__": "cc.Prefab" }, + "lbl_points": null, + "tab_basic": null, + "tab_special": null, + "tab_super": null, + "lbl_tab_basic": null, + "lbl_tab_special": null, + "lbl_tab_super": null, + "btn_reset": null, "_id": "" }, { diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index a591a946..be10efe4 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -9,7 +9,7 @@ import { GameScoreStats } from "./config/HeroAttrs"; import { mLogger } from "./Logger"; import { gameDataSync } from "./GameDataSync"; import { HERO_UPGRADE_NEED_FRAGMENTS } from "./config/GameSet"; -import { TalentSet, getTalentUpgradeCost } from "./config/TalentSet"; +import { TalentSet, getTalentUpgradeCost, isTalentTierUnlocked } from "./config/TalentSet"; /** * 用远程数据覆盖本地数据（统一方法） @@ -418,7 +418,7 @@ export class SingletonModuleComp extends ecs.Comp { /** * 消耗天赋点升级天赋（升级即激活，下一局生效） * @param uuid 天赋 uuid - * @returns 是否升级成功（天赋不存在/已满级/前置未满足/点数不足时返回 false） + * @returns 是否升级成功（天赋不存在/已满级/阶位未解锁/点数不足时返回 false） */ upgradeTalent(uuid: number): boolean { const cfg = TalentSet[uuid]; @@ -426,12 +426,8 @@ export class SingletonModuleComp extends ecs.Comp { if (!this.data.talents) this.data.talents = {}; const curLv = this.getTalentLv(uuid); if (curLv >= cfg.max_lv) return false; - // 专精天赋的前置要求：前置天赋等级不足则禁止升级 - if (cfg.requires) { - for (const req of cfg.requires) { - if (this.getTalentLv(req.uuid) < req.lv) return false; - } - } + // 阶位解锁：二/三阶天赋要求前一阶累计投入点数达标（一阶恒解锁） + if (!isTalentTierUnlocked(this.data.talents, cfg.tier)) return false; const cost = getTalentUpgradeCost(curLv); if (cost < 0 || this.getTalentPoints() < cost) return false; this.data.talent_points -= cost; diff --git a/assets/script/game/common/config/TalentSet.ts b/assets/script/game/common/config/TalentSet.ts index fa8daabe..9b32d622 100644 --- a/assets/script/game/common/config/TalentSet.ts +++ b/assets/script/game/common/config/TalentSet.ts @@ -4,9 +4,13 @@ import { HRole } from "./heroSet"; /** * 天赋系统配置（局外成长：升级即激活，战斗中对英雄属性常驻加成）。 * - * 双层结构： - * - 基础天赋：全局生效，对所有英雄叠加； - * - 专精天赋：按 HRole 职业过滤，仅对匹配职业的英雄生效，且要求前置天赋达到指定等级。 + * 三阶结构（阶位逐级解锁，门槛见 TALENT_TIER_UNLOCK_THRESHOLD）： + * - 一阶·基础天赋（9001-9099）：全局生效，对所有英雄叠加； + * - 二阶·专精天赋（9101-9199）：按 HRole 职业过滤，仅对匹配职业的英雄生效； + * - 三阶·超强天赋（9201-9219）：全局（9201-9209）+ 职业（9211-9219）混合，数值幅度约为前两阶的 2 倍。 + * + * 解锁规则：一阶恒可升级；二阶需一阶累计投入 ≥10 点；三阶需二阶累计投入 ≥10 点。 + * 专精/超强职业天赋不再有独立前置天赋，仅受阶位解锁约束。 * * 结算口径（与项目 buff 规范一致）： * - percent 模式：按英雄基础值（base_ap/base_hp/hero.def）相对放大； @@ -19,6 +23,16 @@ export enum TalentValueMode { Flat = 1, } +/** 天赋阶位：一阶基础 / 二阶专精 / 三阶超强 */ +export enum TalentTier { + /** 一阶：基础天赋，全局生效 */ + Basic = 1, + /** 二阶：专精天赋，按职业过滤 */ + Specialized = 2, + /** 三阶：超强天赋，全局 + 职业混合 */ + Super = 3, +} + /** 单条属性加成词条 */ export interface TalentAttrBonus { /** 目标属性（Attrs 枚举键） */ @@ -33,18 +47,20 @@ export interface TalentAttrBonus { export interface TalentConfig { /** 天赋 uuid（段位见 TalentSet 注释） */ uuid: number; + /** 所属阶位（升级校验：升下一阶天赋需前一阶累计投入点数达标） */ + tier: TalentTier; /** 天赋名称 */ name: string; - /** 描述（UI 展示） */ + /** 描述（UI 展示，{value}/{value2} 为按当前等级计算后的数值占位） */ info: string; + /** 图标（uiconsAtlas 帧名，缺省时 UI 端按资源目录回退） */ + icon?: string; /** 属性加成词条列表（每级叠加） */ bonuses: TalentAttrBonus[]; /** 最大等级 */ max_lv: number; - /** 专精天赋：仅对该职业英雄生效；基础天赋省略此字段 */ + /** 专精/超强职业天赋：仅对该职业英雄生效；全局天赋省略此字段 */ role?: HRole; - /** 专精天赋：前置要求（前置天赋 uuid + 所需等级），全部满足才生效 */ - requires?: { uuid: number; lv: number }[]; } /** 单条已解析的加成（等级已乘算） */ @@ -74,111 +90,185 @@ export interface ITalentTarget { /** * 天赋配置表。 - * uuid 段位：9001-9099 基础天赋（全局）；9101-9199 专精天赋（按职业过滤）。 + * uuid 段位：9001-9099 一阶基础（全局）；9101-9199 二阶专精（按职业）； + * 9201-9209 三阶超强·全局；9211-9219 三阶超强·职业。 + * icon 复用 SkillSet/uiconsAtlas 既有帧名，后续可在编辑器侧替换为专属图标。 */ export const TalentSet: Record = { - // ==================== 基础天赋（9001-9099，全局生效） ==================== + // ==================== 一阶·基础天赋（9001-9099，全局生效） ==================== 9001: { - uuid: 9001, name: "攻击强化", info: "所有英雄攻击 +{value}%", + uuid: 9001, tier: TalentTier.Basic, name: "攻击强化", info: "所有英雄攻击 +{value}%", icon: "Stat_Attack_03", bonuses: [{ attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 3 }], max_lv: 5, }, 9002: { - uuid: 9002, name: "生命强化", info: "所有英雄生命 +{value}%", + uuid: 9002, tier: TalentTier.Basic, name: "生命强化", info: "所有英雄生命 +{value}%", icon: "Stat_Hp_02", bonuses: [{ attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 5 }], max_lv: 5, }, 9003: { - uuid: 9003, name: "防御强化", info: "所有英雄防御 +{value} 点", + uuid: 9003, tier: TalentTier.Basic, name: "防御强化", info: "所有英雄防御 +{value} 点", icon: "Stat_Defense", bonuses: [{ attr: Attrs.defense, mode: TalentValueMode.Flat, per_lv: 8 }], max_lv: 5, }, 9004: { - uuid: 9004, name: "暴击强化", info: "所有英雄暴击率 +{value}%", + uuid: 9004, tier: TalentTier.Basic, name: "暴击强化", info: "所有英雄暴击率 +{value}%", icon: "Stat_CriticalChance_02", bonuses: [{ attr: Attrs.critical, mode: TalentValueMode.Flat, per_lv: 2 }], max_lv: 5, }, 9005: { - uuid: 9005, name: "击晕强化", info: "所有英雄击晕率 +{value}%", + uuid: 9005, tier: TalentTier.Basic, name: "击晕强化", info: "所有英雄击晕率 +{value}%", icon: "Stat_Stun_01", bonuses: [{ attr: Attrs.stun_chance, mode: TalentValueMode.Flat, per_lv: 2 }], max_lv: 5, }, 9006: { - uuid: 9006, name: "冰冻强化", info: "所有英雄冰冻率 +{value}%", + uuid: 9006, tier: TalentTier.Basic, name: "冰冻强化", info: "所有英雄冰冻率 +{value}%", icon: "Stat_Freeze", bonuses: [{ attr: Attrs.freeze_chance, mode: TalentValueMode.Flat, per_lv: 2 }], max_lv: 5, }, 9007: { - uuid: 9007, name: "击退强化", info: "所有英雄击退距离 +{value}", + uuid: 9007, tier: TalentTier.Basic, name: "击退强化", info: "所有英雄击退距离 +{value}", icon: "Stat_Stun_01", bonuses: [{ attr: Attrs.knockback_distance, mode: TalentValueMode.Flat, per_lv: 10 }], max_lv: 5, }, // 风怒机制已停用: 9008 风怒强化天赋已移除 /* 9008: { - uuid: 9008, name: "风怒强化", info: "所有英雄风怒率 +{value}%", + uuid: 9008, tier: TalentTier.Basic, name: "风怒强化", info: "所有英雄风怒率 +{value}%", icon: "Stat_CriticalComboChance", bonuses: [{ attr: Attrs.wfuny, mode: TalentValueMode.Flat, per_lv: 2 }], max_lv: 5, }, */ - // ==================== 专精天赋（9101-9199，按职业过滤 + 前置要求） ==================== - // 坦克专精：前置 防御强化 Lv3 → 坦克大量防御 + 生命 + // ==================== 二阶·专精天赋（9101-9199，按职业过滤；一阶投入 10 点解锁） ==================== 9101: { - uuid: 9101, name: "坦克专精", info: "坦克防御 +{value}%、生命 +{value2}%", + uuid: 9101, tier: TalentTier.Specialized, name: "坦克专精", info: "坦克防御 +{value}%、生命 +{value2}%", icon: "Stat_Armor_01", bonuses: [ { attr: Attrs.defense, mode: TalentValueMode.Percent, per_lv: 30 }, { attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 5 }, ], max_lv: 5, role: HRole.Tank, - requires: [{ uuid: 9003, lv: 3 }], }, - // 战士专精：前置 生命强化 Lv3 → 战士大量生命 9102: { - uuid: 9102, name: "战士专精", info: "战士生命 +{value}%", + uuid: 9102, tier: TalentTier.Specialized, name: "战士专精", info: "战士生命 +{value}%", icon: "Sword-FA_WP_Main_Sword_003_PurpleSilver", bonuses: [{ attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 12 }], max_lv: 5, role: HRole.Warrior, - requires: [{ uuid: 9002, lv: 3 }], }, - // 刺客专精：前置 暴击强化 Lv3 → 刺客攻击 + 暴击 9103: { - uuid: 9103, name: "刺客专精", info: "刺客攻击 +{value}%、暴击率 +{value2}%", + uuid: 9103, tier: TalentTier.Specialized, name: "刺客专精", info: "刺客攻击 +{value}%、暴击率 +{value2}%", icon: "Sword-FA_WP_Main_Sword_019_WoodSilver", bonuses: [ { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 8 }, { attr: Attrs.critical, mode: TalentValueMode.Flat, per_lv: 2 }, ], max_lv: 5, role: HRole.Assassin, - requires: [{ uuid: 9004, lv: 3 }], }, - // 射手专精：前置 攻击强化 Lv3 → 射手攻击 + 穿透 9104: { - uuid: 9104, name: "射手专精", info: "射手攻击 +{value}%、穿透率 +{value2}%", + uuid: 9104, tier: TalentTier.Specialized, name: "射手专精", info: "射手攻击 +{value}%、穿透率 +{value2}%", icon: "Stat_RangedAttack", bonuses: [ { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 8 }, { attr: Attrs.puncture_chance, mode: TalentValueMode.Flat, per_lv: 2 }, ], max_lv: 5, role: HRole.Archer, - requires: [{ uuid: 9001, lv: 3 }], }, - // 法师专精：前置 冰冻强化 Lv3 → 法师攻击 + 冰冻率 9105: { - uuid: 9105, name: "法师专精", info: "法师攻击 +{value}%、冰冻率 +{value2}%", + uuid: 9105, tier: TalentTier.Specialized, name: "法师专精", info: "法师攻击 +{value}%、冰冻率 +{value2}%", icon: "Stat_Mana", bonuses: [ { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 8 }, { attr: Attrs.freeze_chance, mode: TalentValueMode.Flat, per_lv: 2 }, ], max_lv: 5, role: HRole.Mage, - requires: [{ uuid: 9006, lv: 3 }], }, - // 辅助专精：前置 生命强化 Lv3 → 治疗量提升 + 施加的友方 buff 效果放大 9106: { - uuid: 9106, name: "辅助专精", info: "辅助治疗量 +{value}%、施加的增益效果 +{value2}%", + uuid: 9106, tier: TalentTier.Specialized, name: "辅助专精", info: "辅助治疗量 +{value}%、施加的增益效果 +{value2}%", icon: "Stat_PotionBoost", bonuses: [ { attr: Attrs.heal_power, mode: TalentValueMode.Flat, per_lv: 10 }, { attr: Attrs.buff_power, mode: TalentValueMode.Flat, per_lv: 8 }, ], max_lv: 5, role: HRole.Support, - requires: [{ uuid: 9002, lv: 3 }], + }, + + // ==================== 三阶·超强天赋（9201-9219，二阶投入 10 点解锁；幅度约为前两阶 2 倍） ==================== + // ---- 全局超强（9201-9209） ---- + 9201: { + uuid: 9201, tier: TalentTier.Super, name: "神威降临", info: "所有英雄攻击 +{value}%、生命 +{value2}%", icon: "Stat_HolyDamage", + bonuses: [ + { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 8 }, + { attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 8 }, + ], + max_lv: 5, + }, + 9202: { + uuid: 9202, tier: TalentTier.Super, name: "致命终结", info: "所有英雄暴击率 +{value}%、暴击伤害 +{value2}%", icon: "Stat_Critical_01", + bonuses: [ + { attr: Attrs.critical, mode: TalentValueMode.Flat, per_lv: 3 }, + { attr: Attrs.critical_damage, mode: TalentValueMode.Flat, per_lv: 15 }, + ], + max_lv: 5, + }, + 9203: { + uuid: 9203, tier: TalentTier.Super, name: "破甲重创", info: "所有英雄穿透率 +{value}%、穿透伤害 +{value2}%", icon: "Stat_Tripleshot", + bonuses: [ + { attr: Attrs.puncture_chance, mode: TalentValueMode.Flat, per_lv: 3 }, + { attr: Attrs.puncture_dmg_bonus, mode: TalentValueMode.Flat, per_lv: 10 }, + ], + max_lv: 5, + }, + 9204: { + uuid: 9204, tier: TalentTier.Super, name: "钢铁之躯", info: "所有英雄防御 +{value}%、生命 +{value2}%", icon: "Stat_Defense", + bonuses: [ + { attr: Attrs.defense, mode: TalentValueMode.Percent, per_lv: 20 }, + { attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 6 }, + ], + max_lv: 5, + }, + // ---- 职业超强（9211-9219，按 HRole 过滤） ---- + 9211: { + uuid: 9211, tier: TalentTier.Super, name: "不朽壁垒", info: "坦克防御 +{value}%、生命 +{value2}%", icon: "Stat_Armor_01", + bonuses: [ + { attr: Attrs.defense, mode: TalentValueMode.Percent, per_lv: 40 }, + { attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 8 }, + ], + max_lv: 5, role: HRole.Tank, + }, + 9212: { + uuid: 9212, tier: TalentTier.Super, name: "狂血战魂", info: "战士攻击 +{value}%、生命 +{value2}%", icon: "Stat_Attack_03", + bonuses: [ + { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 10 }, + { attr: Attrs.hp_max, mode: TalentValueMode.Percent, per_lv: 8 }, + ], + max_lv: 5, role: HRole.Warrior, + }, + 9213: { + uuid: 9213, tier: TalentTier.Super, name: "影刃绝杀", info: "刺客攻击 +{value}%、暴击伤害 +{value2}%", icon: "Sword-FA_WP_Main_Sword_019_WoodSilver", + bonuses: [ + { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 12 }, + { attr: Attrs.critical_damage, mode: TalentValueMode.Flat, per_lv: 12 }, + ], + max_lv: 5, role: HRole.Assassin, + }, + 9214: { + uuid: 9214, tier: TalentTier.Super, name: "穿云贯日", info: "射手攻击 +{value}%、穿透伤害 +{value2}%", icon: "Stat_RangedAttack", + bonuses: [ + { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 12 }, + { attr: Attrs.puncture_dmg_bonus, mode: TalentValueMode.Flat, per_lv: 8 }, + ], + max_lv: 5, role: HRole.Archer, + }, + 9215: { + uuid: 9215, tier: TalentTier.Super, name: "元素主宰", info: "法师攻击 +{value}%、冰冻率 +{value2}%", icon: "Sub_Item-FA_WP_Sub_MagicBall_001_Blue", + bonuses: [ + { attr: Attrs.ap, mode: TalentValueMode.Percent, per_lv: 12 }, + { attr: Attrs.freeze_chance, mode: TalentValueMode.Flat, per_lv: 3 }, + ], + max_lv: 5, role: HRole.Mage, + }, + 9216: { + uuid: 9216, tier: TalentTier.Super, name: "圣光普照", info: "辅助治疗量 +{value}%、施加的增益效果 +{value2}%", icon: "Stat_HolyDamage", + bonuses: [ + { attr: Attrs.heal_power, mode: TalentValueMode.Flat, per_lv: 15 }, + { attr: Attrs.buff_power, mode: TalentValueMode.Flat, per_lv: 12 }, + ], + max_lv: 5, role: HRole.Support, }, }; @@ -195,12 +285,91 @@ export function getTalentUpgradeCost(curLv: number): number { return TALENT_UPGRADE_COST[curLv]; } +/** 阶位解锁门槛：前一阶累计投入 ≥ 该点数才能升级下一阶天赋 */ +export const TALENT_TIER_UNLOCK_THRESHOLD = 10; + +/** + * 计算指定阶位已投入的天赋点数（按升级消耗表逐级累加）。 + * Why: 阶位解锁按"实际消耗点数"而非"等级总和"口径——与玩家直觉（投入了多少点） + * 及重置退款口径（resetTalents 同表对账）保持一致。 + * @param levels 天赋等级表（key 为天赋 uuid，value 为当前等级） + * @param tier 目标阶位 + * @returns 该阶位全部天赋已投入的点数总和 + */ +export function getTalentTierInvestedPoints(levels: Record, tier: TalentTier): number { + if (!levels) return 0; + let invested = 0; + for (const key in levels) { + const cfg = TalentSet[key]; + if (!cfg || cfg.tier !== tier) continue; + for (let i = 0; i < levels[key]; i++) { + const c = getTalentUpgradeCost(i); + if (c > 0) invested += c; + } + } + return invested; +} + +/** + * 判断指定阶位是否已解锁（加点入口校验用；战斗结算无需关心阶位——已投入的等级恒生效）。 + * 规则：一阶恒解锁；二阶要求一阶累计投入 ≥ TALENT_TIER_UNLOCK_THRESHOLD；三阶要求二阶累计投入达标。 + * @param levels 天赋等级表 + * @param tier 目标阶位 + */ +export function isTalentTierUnlocked(levels: Record, tier: TalentTier): boolean { + if (tier === TalentTier.Basic) return true; + const prevTier = (tier - 1) as TalentTier; + return getTalentTierInvestedPoints(levels, prevTier) >= TALENT_TIER_UNLOCK_THRESHOLD; +} + +/** 天赋属性的卡面显示名（迷你卡空间有限，用短标签） */ +const TALENT_ATTR_LABELS: Partial> = { + [Attrs.ap]: "攻击", + [Attrs.hp_max]: "生命", + [Attrs.defense]: "防御", + [Attrs.critical]: "暴击", + [Attrs.critical_damage]: "暴伤", + [Attrs.stun_chance]: "击晕", + [Attrs.freeze_chance]: "冰冻", + [Attrs.knockback_distance]: "击退", + [Attrs.puncture_chance]: "穿透", + [Attrs.puncture_dmg_bonus]: "穿透伤", + [Attrs.heal_power]: "治疗", + [Attrs.buff_power]: "增益", +}; + +/** 天赋属性的单位后缀：概率/治疗/增益类为百分点（%），防御为"点"，击退距离为纯数值 */ +const TALENT_ATTR_SUFFIX: Partial> = { + [Attrs.defense]: "点", + [Attrs.knockback_distance]: "", +}; + +/** + * 生成天赋迷你卡的卡面文案（自包含：不显示满级效果）。 + * 规则：已加点（lv>0）显示当前已生效数值，如「攻击 +9%」； + * 未加点（lv=0）显示每级数值引导，如「攻击 +3%/级」。 + * Why: 迷你点选卡没有二级详情入口，文案必须一眼看懂当前收益。 + * @param cfg 天赋配置 + * @param lv 当前等级 + */ +export function getTalentDisplayText(cfg: TalentConfig, lv: number): string { + const mult = lv > 0 ? lv : 1; + const parts: string[] = []; + for (const b of cfg.bonuses) { + const label = TALENT_ATTR_LABELS[b.attr] ?? String(b.attr); + const suffix = TALENT_ATTR_SUFFIX[b.attr] ?? "%"; + parts.push(`${label} +${b.per_lv * mult}${suffix}`); + } + const text = parts.join("、"); + return lv > 0 ? text : `${text}/级`; +} + /** * 聚合指定职业英雄生效的全部天赋加成。 - * Why: 基础天赋全局生效，专精天赋按 role 过滤且要求前置天赋达标； - * 战斗加载时（Hero.load / applyHeroLevel）调用本函数一次性取出本英雄的天赋加成区。 + * Why: 基础/超强全局天赋全局生效，专精与超强职业天赋按 role 过滤； + * 阶位解锁只约束加点阶段，战斗加载时（Hero.load / applyHeroLevel）按当前等级直接取加成。 * @param levels 天赋等级表（key 为天赋 uuid，value 为当前等级） - * @param role 英雄职业（专精过滤依据；无 role 时只应用基础天赋） + * @param role 英雄职业（职业过滤依据；无 role 时只应用全局天赋） * @returns 已解析的加成列表（等级已乘算进 value） */ export function getTalentBonusesForRole(levels: Record, role?: HRole): TalentResolvedBonus[] { @@ -211,16 +380,8 @@ export function getTalentBonusesForRole(levels: Record, role?: H if (lv <= 0) continue; const cfg = TalentSet[key]; if (!cfg) continue; - // 专精天赋：职业不匹配则跳过 + // 职业天赋：职业不匹配则跳过 if (cfg.role !== undefined && cfg.role !== role) continue; - // 前置要求：任一前置天赋等级不足则不生效 - if (cfg.requires) { - let ok = true; - for (const req of cfg.requires) { - if ((levels[req.uuid] ?? 0) < req.lv) { ok = false; break; } - } - if (!ok) continue; - } for (const b of cfg.bonuses) { result.push({ attr: b.attr, mode: b.mode, value: b.per_lv * lv }); } @@ -240,7 +401,7 @@ export function getTalentBonusesForRole(levels: Record, role?: H * * @param model 英雄属性模型（满足 ITalentTarget 结构） * @param levels 天赋等级表（smc.getTalentLevels()） - * @param role 英雄职业（专精过滤；无 role 的怪物由调用方跳过） + * @param role 英雄职业（职业过滤；无 role 的怪物由调用方跳过） */ export function applyTalentBonuses(model: ITalentTarget, levels: Record, role?: HRole): void { const bonuses = getTalentBonusesForRole(levels, role); diff --git a/assets/script/game/common/config/talent-system.md b/assets/script/game/common/config/talent-system.md index cfa31028..3e7f6e43 100644 --- a/assets/script/game/common/config/talent-system.md +++ b/assets/script/game/common/config/talent-system.md @@ -1,7 +1,7 @@ # 天赋系统设计 — Draftmaster Arena *Created: 2026-04-26* -*Updated: 2026-04-26* +*Updated: 2026-08-25* *Status: Draft* --- @@ -10,7 +10,15 @@ 局外成长系统。通过每局获取的经验值提升玩家等级，获得天赋点数，用于升级天赋。升级即激活，无需单独激活步骤。看广告可重置所有天赋等级并退还天赋点。 -**设计原则**：天赋提供小幅加成，不改变核心策略体验。高评分 = 更多经验 = 更快升级，但天赋不是胜利的决定性因素。 +**三阶结构**： + +| 阶位 | 名称 | 生效范围 | uuid 段位 | +|------|------|---------|----------| +| 一阶 | 基础天赋 | 全局（所有英雄） | 9001-9099 | +| 二阶 | 专精天赋 | 按职业过滤 | 9101-9199 | +| 三阶 | 超强天赋 | 全局 + 职业混合 | 9201-9219 | + +**设计原则**：天赋提供小幅加成，不改变核心策略体验。高评分 = 更多经验 = 更快升级，但天赋不是胜利的决定性因素。三阶超强天赋幅度约为前两阶的 2 倍，作为长线成长的目标感奖励。 **成长闭环**：评分 → 经验 → 等级 → 天赋点 → 天赋升级 → 下一局更强 → 更高评分 @@ -52,25 +60,54 @@ ## 天赋列表 -### 战斗属性类（全局加成） +### 一阶·基础天赋（全局加成，9001-9099） | 天赋 | 每级效果 | 5级总效果 | |------|---------|----------| | **攻击强化** | 所有英雄 ATK +3% | +15% | | **生命强化** | 所有英雄 HP +5% | +25% | +| **防御强化** | 所有英雄防御 +8 点 | +40 点 | | **暴击强化** | 所有英雄暴击率 +2% | +10% | -| **风怒强化** | 所有英雄风怒率 +2% | +10% | +| **击晕强化** | 所有英雄击晕率 +2% | +10% | | **冰冻强化** | 所有英雄冰冻率 +2% | +10% | -| **穿刺强化** | 所有英雄穿刺 +0.2 | +1 | -| **护盾强化** | 所有护盾效果 +5% | +25% | +| **击退强化** | 所有英雄击退距离 +10 | +50 | -### 经济类（金币减免/补贴） +> 风怒强化（原 9008）已随风怒机制停用移除。 + +### 二阶·专精天赋（按职业过滤，9101-9199） + +| 天赋 | 职业 | 每级效果 | 5级总效果 | +|------|------|---------|----------| +| **坦克专精** | 坦克 | 防御 +30%、生命 +5% | +150%、+25% | +| **战士专精** | 战士 | 生命 +12% | +60% | +| **刺客专精** | 刺客 | ATK +8%、暴击率 +2% | +40%、+10% | +| **射手专精** | 射手 | ATK +8%、穿透率 +2% | +40%、+10% | +| **法师专精** | 法师 | ATK +8%、冰冻率 +2% | +40%、+10% | +| **辅助专精** | 辅助 | 治疗量 +10%、增益效果 +8% | +50%、+40% | + +> 专精天赋不再有独立前置天赋，仅受阶位解锁约束（见核心规则）。 + +### 三阶·超强天赋（全局 + 职业混合，9201-9219） + +**全局超强（9201-9204）**： | 天赋 | 每级效果 | 5级总效果 | |------|---------|----------| -| **采购优惠** | 购买英雄 -1金 | -5金（10→5） | -| **刷新优惠** | 刷新重抽 -0.5金 | -2.5金（3→0.5） | -| **出售补贴** | 出售英雄返还 +10%金币 | +50% | +| **神威降临** | 所有英雄 ATK +8%、HP +8% | +40%、+40% | +| **致命终结** | 所有英雄暴击率 +3%、暴击伤害 +15% | +15%、+75% | +| **破甲重创** | 所有英雄穿透率 +3%、穿透伤害 +10% | +15%、+50% | +| **钢铁之躯** | 所有英雄防御 +20%、HP +6% | +100%、+30% | + +**职业超强（9211-9216）**： + +| 天赋 | 职业 | 每级效果 | 5级总效果 | +|------|------|---------|----------| +| **不朽壁垒** | 坦克 | 防御 +40%、生命 +8% | +200%、+40% | +| **狂血战魂** | 战士 | ATK +10%、HP +8% | +50%、+40% | +| **影刃绝杀** | 刺客 | ATK +12%、暴击伤害 +12% | +60%、+60% | +| **穿云贯日** | 射手 | ATK +12%、穿透伤害 +8% | +60%、+40% | +| **元素主宰** | 法师 | ATK +12%、冰冻率 +3% | +60%、+15% | +| **圣光普照** | 辅助 | 治疗量 +15%、增益效果 +12% | +75%、+60% | --- @@ -84,17 +121,20 @@ | 4级 | 2点 | 6 | | 5级 | 3点 | 9 | -**一个天赋升满 = 9点** - -30个天赋点的分配选择： -- 专精：升满3个天赋（27点）+ 3点分散 -- 均衡：6-7个天赋各1-2级 -- 经济：采购+刷新+出售全满（27点） +**一个天赋升满 = 9点**（各阶位升级费用相同） --- ## 核心规则 +### 阶位解锁 + +- **一阶**：恒可升级 +- **二阶**：一阶天赋累计投入 **≥10 点** 后解锁 +- **三阶**：二阶天赋累计投入 **≥10 点** 后解锁 +- 投入点数按实际消耗计算（非等级总和），与重置退款口径一致 +- 专精/超强职业天赋没有独立前置天赋，仅受阶位解锁约束 + ### 升级即激活 - 消耗天赋点升级天赋 → 立即生效 @@ -104,7 +144,7 @@ ### 重置（看广告） -- 观看广告 → **所有天赋等级归零** +- 观看广告 → **所有天赋等级归零**（阶位解锁状态随之重置） - **退还全部天赋点**（30点内已消耗的） - 玩家等级不变（经验永久累积） - 重新自由分配天赋点 @@ -114,67 +154,83 @@ ## 分配策略示例 -**暴击流专精**（27点）： +30 点总预算下：10 点开二阶 + 10 点开三阶 = 20 点门槛，剩余约 10 点自由分配。 + +**满配输出流**（30点）： ``` -暴击强化 Lv5(9) + 攻击强化 Lv5(9) + 采购优惠 Lv5(9) = 27点 -→ 全局暴击+10%, ATK+15%, 买卡-5金 +一阶: 攻击强化 Lv4(6) + 暴击强化 Lv2(2) + 生命强化 Lv2(2) = 10点 → 解锁二阶 +二阶: 刺客专精 Lv4(6) + 战士专精 Lv2(2) + 坦克专精 Lv1(1) + 射手专精 Lv1(1) = 10点 → 解锁三阶 +三阶: 致命终结 Lv4(6) + 影刃绝杀 Lv1(1) = 7点 + 3点备用 +→ 全局暴击+15%/暴伤+75%，刺客 ATK+40%+60%、暴伤+60%+12% ``` -**护盾流专精**（27点）： +**生存流**（29点）： ``` -护盾强化 Lv5(9) + 生命强化 Lv5(9) + 冰冻强化 Lv5(9) = 27点 -→ 护盾+25%, HP+25%, 冰冻+10% +一阶: 生命强化 Lv5(9) + 防御强化 Lv1(1) = 10点 +二阶: 坦克专精 Lv5(9) + 战士专精 Lv1(1) = 10点 +三阶: 钢铁之躯 Lv5(9) = 9点 +→ 全局 HP+55%/防御+100%，坦克 HP+65%/防御+250% ``` -**经济流**（27点）： +**均衡新手**（20点）： ``` -采购优惠 Lv5(9) + 刷新优惠 Lv5(9) + 出售补贴 Lv5(9) = 27点 -→ 买卡5金, 刷新0.5金, 出售+50%返还 -``` - -**均衡新手**（26点）： -``` -攻击 Lv3(4) + 生命 Lv3(4) + 采购 Lv3(4) + -暴击 Lv2(2) + 护盾 Lv2(2) + 刷新 Lv2(2) + -风怒 Lv2(2) + 冰冻 Lv2(2) = 22点 + 4点备用 +一阶: 攻击 Lv3(4) + 生命 Lv3(4) + 暴击 Lv1(1) + 击晕 Lv1(1) = 10点 +二阶: 按主力阵容选 2 个专精各 Lv3(8) + 1 个 Lv1(1) ≈ 10点（刚开三阶） +三阶: 留待后续点数 ``` --- -## 界面布局 +## 界面设计（阶位 Tab 单屏聚焦 · 迷你点选卡） ``` -┌─────────────────────────┐ -│ Lv.12 ████████░░ 150/200│ -│ 天赋点: 4/30 │ -├─────────────────────────┤ -│ │ -│ ⚔️ 攻击强化 Lv.3 ███░░ │ -│ ATK +9% [+1点] │ -│ │ -│ ❤️ 生命强化 Lv.2 ██░░░ │ -│ HP +10% [+2点] │ -│ │ -│ 🔥 暴击强化 Lv.1 █░░░░ │ -│ 暴击 +2% [+1点] │ -│ │ -│ ⚡ 风怒强化 Lv.0 ░░░░░ │ -│ 风怒 +0% [+1点] │ -│ │ -│ ❄️ 冰冻强化 Lv.0 ░░░░░ │ -│ 冰冻 +0% [+1点] │ -│ │ -│ 🛡️ 护盾强化 Lv.0 ░░░░░ │ -│ 🗡️ 穿刺强化 Lv.0 ░░░░░ │ -│ 🛒 采购优惠 Lv.2 ██░░░ │ -│ 🔄 刷新优惠 Lv.0 ░░░░░ │ -│ 💰 出售补贴 Lv.0 ░░░░░ │ -│ │ -│ [🎬 看广告重置天赋] │ -│ [← 返回] │ -└─────────────────────────┘ +┌─────────────────────────────────┐ +│ 天赋点: 4 │ +│ [Ⅰ 基础] [Ⅱ 专精 6/10🔒] [Ⅲ 超强 0/10🔒] │ +├─────────────────────────────────┤ +│ ┌──────┐ ┌──────┐ ┌──────┐ │ +│ │ ⚔️ │ │ ❤️ │ │ 🛡️ │ │ +│ │ 攻击强化│ │ 生命强化│ │ 防御强化│ │ +│ │攻击 +9%│ │生命+10%│ │防御+8点│ │ +│ │ 3/5│ │ 2/5│ │ 1/5│ │ +│ │ [+]│ │ [+]│ │ [+]│ │ +│ └──────┘ └──────┘ └──────┘ │ +│ ……（Grid 三列，单屏聚焦当前阶） │ +│ │ +│ [🎬 看广告重置天赋] │ +└─────────────────────────────────┘ ``` +### 卡片规格（迷你点选卡，自包含） + +- **布局**：图标 / 名称 / 当前已生效数值 / 右下「当前/满级」数字角标；右上 `+` 升级徽标 +- **卡面数值**：已加点显示当前生效值（如「攻击 +9%」）；Lv0 显示每级引导（如「攻击 +3%/级」）；**不显示满级效果**（`getTalentDisplayText`） +- **阶位底框**：复用 cardbg.prefab + CardBgComp，Ⅰ→蓝(2) / Ⅱ→紫(3) / Ⅲ→金(4) +- **状态机**：可升级（`+` 徽标绿光呼吸）｜满级（MAX 金角标）｜阶未解锁（半透明 110 + 🔒，无 `+`） + +### 交互规则 + +- **点击 `+` 徽标 / 卡体** → 统一上抛 uuid，由 TalentsComp 校验： + - 阶未解锁 → toast「一阶投入 x/10 点解锁本阶」 + - 已满级 → toast「该天赋已满级」 + - 点数不足 → toast「天赋点不足」 + - 校验通过 → `smc.upgradeTalent(uuid)`，成功由 `TALENT_UPDATE` 事件驱动全量刷新 +- **阶位 Tab**：三 Tab 常显；锁定 Tab 显示前阶投入进度（`x/10`）；点击锁定 Tab 允许查看（卡片呈锁定态）并 toast 解锁条件；首次进入默认选中已解锁的最高阶 +- **重置**：底部按钮 → CommonPrompt 二次确认 → `smc.resetTalents()`（广告 SDK 接入前先直接确认重置） + +### 编辑器搭建清单（prefab） + +- `talents.prefab`（复用现有骨架改造）：ScrollView + Grid 三列 content 挂 `talents_content`；新增页头 `lbl_points`、三个 Tab 节点（挂 `tab_basic/tab_special/tab_super` + 各自 Label、可选子节点 `sp_on` 选中高亮）、底部 `btn_reset` +- `prefab_talent_item.prefab`（复用改造）：`icon` / `lbl_name` / `lbl_desc`→`lbl_info` / `lbl_level`→`lbl_lv` 四个既有节点绑定沿用；新增 `node_plus`（+ 徽标）、`node_max`（MAX 角标）、`node_lock`（锁遮罩） +- 图标：TalentSet 配置 `icon` 字段（uiconsAtlas 帧名），暂复用技能图标素材 + --- +## 实现映射 + +- 配置与工具函数：`TalentSet.ts`（`TalentTier` 阶位枚举、`isTalentTierUnlocked` / `getTalentTierInvestedPoints` 解锁校验、`getTalentDisplayText` 卡面文案、`applyTalentBonuses` 战斗注入） +- 存储/升级/重置：`SingletonModuleComp.ts`（`upgradeTalent` 内做阶位解锁校验） +- 战斗注入点：`Hero.load`（召唤加载）与 `MissionCardComp.applyHeroLevel`（局内升级重算，累加语义字段先归零再注入） +- 加点 UI：`TalentsComp.ts`（阶位 Tab 页容器）+ `TalentItemComp.ts`（迷你升级卡），挂主界面现有"天赋"页签（MissionHomeComp.showPage 切换） + *与评分系统联动：评分 → 经验 → 等级 → 天赋点 → 天赋 → 下一局更强 → 更高评分 → 更多经验* diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 39b42ab6..16fd5faa 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -195,7 +195,7 @@ export class Hero extends ecs.Entity { model.ap += apExtra; } - // 天赋加成层：基础天赋全局生效，专精天赋按职业过滤（仅英雄生效，怪物跳过） + // 天赋加成层：全局天赋（一阶基础/三阶超强全局）全局生效，职业天赋（二阶专精/三阶超强职业）按 role 过滤（仅英雄生效，怪物跳过） // Why: 放在成长/bonus 之后、光环乘区之后，以基础快照为基数叠加，避免与乘区叠加成乘法膨胀 if (model.fac === FacSet.HERO) { applyTalentBonuses(model, smc.getTalentLevels(), model.role); diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 534ebb9d..07a24709 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -2189,11 +2189,13 @@ export class MissionCardComp extends CCComp { if (model.fac === FacSet.HERO) { model.defense = hero.def; model.critical = 0; + model.critical_damage = 0; model.stun_chance = 0; model.freeze_chance = 0; // 风怒机制已停用: 升级重算不再重置风怒 // model.wfuny = 0; model.puncture_chance = 0; + model.puncture_dmg_bonus = 0; model.knockback_distance = 0; model.heal_power = 0; model.buff_power = 0; diff --git a/assets/script/game/map/TalentItemComp.ts b/assets/script/game/map/TalentItemComp.ts index 717fbb03..88adbffa 100644 --- a/assets/script/game/map/TalentItemComp.ts +++ b/assets/script/game/map/TalentItemComp.ts @@ -1,28 +1,36 @@ /** * @file TalentItemComp.ts - * @description 天赋图鉴项组件（UI 视图层） + * @description 天赋迷你升级卡组件（UI 视图层） * * 职责： - * 1. 接收 TalentsComp 下发的天赋卡配置（技能卡）。 - * 2. 渲染名称、描述、图标和背景。 - * 3. 背景颜色根据 wave 映射为对应的 poolLv。 + * 1. 接收 TalentsComp 下发的天赋配置 + 当前等级 + 阶位解锁态，渲染迷你点选卡。 + * 2. 卡面自包含：图标 / 名称 / 当前已生效数值（Lv0 显示每级数值引导）/ 右下「当前/满级」角标。 + * 3. 状态机：可升级（右上 + 徽标，绿光呼吸）/ 满级（MAX 金角标）/ 阶未解锁（半透明 + 锁）。 + * 4. 点击回调上抛（含 + 徽标与卡体），升级校验与 toast 统一由 TalentsComp 处理（单一决策点）。 * * 依赖： - * - CardSet.CardConfig —— 单条卡牌配置 - * - SkillSet —— 获取技能图标 + * - TalentSet.TalentConfig / TalentTier / getTalentDisplayText —— 配置与卡面文案 + * - CardBgComp —— 阶位品质底框（Ⅰ蓝 / Ⅱ紫 / Ⅲ金） + * - smc.uiconsAtlas —— 图标解析（缺省回退资源目录） */ -import { _decorator, Label, Sprite, SpriteFrame } from "cc"; +import { _decorator, Label, Node, NodeEventType, Sprite, SpriteFrame, UIOpacity } 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 { FieldSkillSet, SkillSet } from "../common/config/SkillSet"; +import { TalentConfig, TalentTier, getTalentDisplayText } from "../common/config/TalentSet"; import { CardBgComp } from "./CardBgComp"; import { smc } from "../common/SingletonModuleComp"; import { oops } from "db://oops-framework/core/Oops"; const { ccclass, property } = _decorator; -/** TalentItemComp —— 天赋图鉴项组件 */ +/** 阶位 → 品质底框 card_lv（CARD_LV_BG_COLORS：2=blue、3=purple、4=yellow） */ +const TIER_TO_BG_LV: Record = { + [TalentTier.Basic]: 2, + [TalentTier.Specialized]: 3, + [TalentTier.Super]: 4, +}; + +/** TalentItemComp —— 天赋迷你升级卡组件 */ @ccclass('TalentItemComp') @ecs.register('TalentItem', false) export class TalentItemComp extends CCComp { @@ -30,53 +38,86 @@ export class TalentItemComp extends CCComp { @property({ type: Label, tooltip: "天赋名称" }) lbl_name: Label = null!; - @property({ type: Label, tooltip: "天赋说明" }) + @property({ type: Label, tooltip: "当前已生效数值（Lv0 显示每级引导）" }) lbl_info: Label = null!; + @property({ type: Label, tooltip: "等级角标（当前/满级）" }) + lbl_lv: Label = null!; + @property({ type: Sprite, tooltip: "天赋图标" }) icon: Sprite = null!; - @property({ type: CardBgComp, tooltip: "卡牌背景组件" }) + @property({ type: CardBgComp, tooltip: "卡牌背景组件（阶位品质色）" }) bg: CardBgComp = null!; + @property({ type: Node, tooltip: "右上 + 升级徽标（可升级时显示）" }) + node_plus: Node = null!; + + @property({ type: Node, tooltip: "MAX 满级角标" }) + node_max: Node = null!; + + @property({ type: Node, tooltip: "阶位未解锁遮罩/锁图标" }) + node_lock: Node = null!; + + /** 点击回调（卡体与 + 徽标同源上抛），由父级统一校验升级 */ + public onTalentTap: ((uuid: number) => void) | null = null; + + /** 当前展示的天赋 uuid（回调携带） */ + private curUuid: number = 0; + + protected onLoad(): void { + this.node.on(NodeEventType.TOUCH_END, this.onTap, this); + } + + protected onDestroy(): void { + this.node.off(NodeEventType.TOUCH_END, this.onTap, this); + } + /** - * 刷新单条天赋展示 - * @param config CardPoolList 中的天赋卡（技能卡）配置 + * 刷新迷你卡展示 + * @param cfg 天赋配置（TalentSet 条目） + * @param lv 当前等级 + * @param tierUnlocked 所属阶位是否已解锁 + * @param canUp 父级预判的"可升级"（阶位解锁 + 未满级 + 点数足够） */ - public updateItem(config: CardConfig): void { - if (!config) return; + public updateItem(cfg: TalentConfig, lv: number, tierUnlocked: boolean, canUp: boolean): void { + if (!cfg) return; + this.curUuid = cfg.uuid; - if (this.lbl_name) this.lbl_name.string = config.name ?? ""; - if (this.lbl_info) this.lbl_info.string = config.info ?? ""; + if (this.lbl_name) this.lbl_name.string = cfg.name; + // 卡面自包含：已加点显示当前生效数值，未加点显示每级数值引导 + if (this.lbl_info) this.lbl_info.string = getTalentDisplayText(cfg, lv); + if (this.lbl_lv) this.lbl_lv.string = `${lv}/${cfg.max_lv}`; - // 直接复用 CardSet 中已映射好的 card_lv，保证与技能卡牌背景一致 - // CardSet 通过 waveToCardLv[wave] 由 SKILL_CARD_WAVES 索引推导（wave 1→1, 5→2, 8→3） - if (this.bg) { - this.bg.apply(config.card_lv || 1); + // 阶位品质底框：Ⅰ蓝 / Ⅱ紫 / Ⅲ金 + if (this.bg) this.bg.apply(TIER_TO_BG_LV[cfg.tier] ?? 1); + + // 图标：uiconsAtlas 优先，资源目录回退（与 TalentItemComp 旧版/SCardComp 口径一致） + if (this.icon && cfg.icon) { + let frame: SpriteFrame | null = null; + if (smc.uiconsAtlas) { + frame = smc.uiconsAtlas.getSpriteFrame(cfg.icon); + } + if (!frame) { + frame = oops.res.get("game/heros/cards/" + cfg.icon, SpriteFrame) as SpriteFrame; + } + if (frame) this.icon.spriteFrame = frame; } - // 设置图标：驻场卡(skill=undefined 但有 field)走 FieldSkillSet，否则走 SkillSet - // 与 SCardComp 保持一致，避免驻场卡无 icon 显示 - if (this.icon) { - let iconId: string | undefined; - if (!config.skill && config.field && config.field.length > 0) { - // 驻场卡：用 FieldSkillSet[field[0]].icon - const fieldUuid = config.field[0].uuid; - iconId = FieldSkillSet[fieldUuid]?.icon || `${fieldUuid}`; - } else if (config.skill) { - // 技能卡：用 SkillSet[skill].icon - iconId = SkillSet[config.skill]?.icon; - } - if (iconId) { - if (smc.uiconsAtlas) { - const frame = smc.uiconsAtlas.getSpriteFrame(iconId); - if (frame) this.icon.spriteFrame = frame; - } else { - const sf = oops.res.get("game/heros/cards/" + iconId, SpriteFrame) as SpriteFrame; - if (sf) this.icon.spriteFrame = sf; - } - } - } + // 状态徽标：满级 MAX / 可升级 + / 阶位锁定 🔒 + const maxed = lv >= cfg.max_lv; + if (this.node_max) this.node_max.active = maxed; + if (this.node_plus) this.node_plus.active = !maxed && tierUnlocked && canUp; + if (this.node_lock) this.node_lock.active = !tierUnlocked; + + // 阶位锁定整卡压暗（UIOpacity：Cocos 3.x 节点透明度组件） + const uo = this.node.getComponent(UIOpacity) ?? this.node.addComponent(UIOpacity); + uo.opacity = tierUnlocked ? 255 : 110; + } + + /** 卡体/+ 徽标点击：上抛 uuid，升级校验与提示由 TalentsComp 统一处理 */ + private onTap(): void { + this.onTalentTap?.(this.curUuid); } /** ECS 组件移除时销毁节点（CCComp 抽象方法实现） */ diff --git a/assets/script/game/map/TalentsComp.ts b/assets/script/game/map/TalentsComp.ts index 98535d11..1f8fe1a3 100644 --- a/assets/script/game/map/TalentsComp.ts +++ b/assets/script/game/map/TalentsComp.ts @@ -1,106 +1,233 @@ /** * @file TalentsComp.ts - * @description 天赋图鉴页组件（UI 视图层） + * @description 天赋加点页组件（UI 视图层） * * 职责： - * 1. 展示当前所有天赋卡（技能卡）的图鉴。 - * 2. 从 CardPoolList 获取所有的 type=Skill 卡牌。 - * 3. 兼容旧的 `@ecs.register('Talents')` 资源引用。 + * 1. 三阶页签（Ⅰ 基础 / Ⅱ 专精 / Ⅲ 超强）状态机：单屏聚焦当前阶位的迷你天赋卡。 + * 2. 页签常显解锁进度（前阶投入 x/10），点击卡/+ 徽标升级（smc.upgradeTalent）。 + * 3. 监听 GameEvent.TALENT_UPDATE 全量重渲染（23 条卡片，无需虚拟列表）。 + * 4. 看广告重置入口：CommonPrompt 二次确认后调 smc.resetTalents() 退还全部点数。 * * 依赖： - * - CardPoolList（CardSet）—— 获取技能卡配置 - * - TalentItemComp —— 单条天赋图鉴项视图 + * - TalentSet（TalentSet/TalentTier/isTalentTierUnlocked/getTalentTierInvestedPoints）—— 配置与阶位校验 + * - TalentItemComp —— 单张迷你升级卡 + * - smc —— 天赋等级表/点数/升级/重置 */ -import { _decorator, instantiate, Node, Prefab, UITransform } from "cc"; +import { _decorator, instantiate, Label, Node, NodeEventType, Prefab, UITransform } 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 { mLogger } from "../common/Logger"; -import { CardConfig } from "../common/config/CardSet"; -import { SkillCardList } from "../common/config/SCardSet"; +import { + TalentSet, TalentTier, + TALENT_TIER_UNLOCK_THRESHOLD, + getTalentTierInvestedPoints, getTalentUpgradeCost, isTalentTierUnlocked, +} from "../common/config/TalentSet"; +import { GameEvent } from "../common/config/GameEvent"; +import { UIID } from "../common/config/GameUIConfig"; import { TalentItemComp } from "./TalentItemComp"; +import { smc } from "../common/SingletonModuleComp"; +import { oops } from "db://oops-framework/core/Oops"; const { ccclass, property } = _decorator; -/** TalentsComp —— 天赋图鉴信息页组件 */ +/** 阶位页签展示文案（锁定态追加投入进度） */ +const TIER_TAB_TEXT: Record = { + [TalentTier.Basic]: { title: "Ⅰ 基础", lockName: "一阶" }, + [TalentTier.Specialized]: { title: "Ⅱ 专精", lockName: "一阶" }, + [TalentTier.Super]: { title: "Ⅲ 超强", lockName: "二阶" }, +}; + +/** 阶位页签选中高亮子节点名（可选，编辑器侧搭建） */ +const TAB_SELECTED_CHILD = "sp_on"; + +/** TalentsComp —— 天赋加点页组件（阶位 Tab 单屏聚焦） */ @ccclass('TalentsComp') @ecs.register('Talents', false) export class TalentsComp extends CCComp { - @property({ type: Node, tooltip: "天赋技能列表容器" }) + @property({ type: Node, tooltip: "当前阶位卡片列表容器（ScrollView content，Grid 三列）" }) talents_content: Node = null!; - @property({ type: Prefab, tooltip: "单条天赋项预制" }) + @property({ type: Prefab, tooltip: "迷你天赋卡预制（TalentItemComp）" }) prefab_talent_item: Prefab = null!; - /** 调试日志开关 */ - debugMode: boolean = false; + @property({ type: Label, tooltip: "页头可用天赋点" }) + lbl_points: Label = null!; - /** 首次实例化缓存 */ - private rendered: boolean = false; + @property({ type: Node, tooltip: "一阶页签节点" }) + tab_basic: Node = null!; - /** 缓存的稳定配置顺序，避免重复渲染时列表抖动 */ - private cachedConfigs: CardConfig[] = []; + @property({ type: Node, tooltip: "二阶页签节点" }) + tab_special: Node = null!; + + @property({ type: Node, tooltip: "三阶页签节点" }) + tab_super: Node = null!; + + @property({ type: Label, tooltip: "一阶页签文案" }) + lbl_tab_basic: Label = null!; + + @property({ type: Label, tooltip: "二阶页签文案" }) + lbl_tab_special: Label = null!; + + @property({ type: Label, tooltip: "三阶页签文案" }) + lbl_tab_super: Label = null!; + + @property({ type: Node, tooltip: "看广告重置按钮" }) + btn_reset: Node = null!; + + /** 当前选中的阶位（首次进入默认为已解锁的最高阶，之后由玩家切换） */ + private curTier: TalentTier = TalentTier.Basic; + + /** 是否已完成首次默认阶位选择 */ + private inited: boolean = false; + + /** 阶位 → 页签节点/文案 映射（onLoad 时装配） */ + private tabNodes: Map = new Map(); + + protected onLoad(): void { + this.tabNodes.set(TalentTier.Basic, { node: this.tab_basic, label: this.lbl_tab_basic }); + this.tabNodes.set(TalentTier.Specialized, { node: this.tab_special, label: this.lbl_tab_special }); + this.tabNodes.set(TalentTier.Super, { node: this.tab_super, label: this.lbl_tab_super }); + + for (const [tier, tab] of this.tabNodes) { + tab.node?.on(NodeEventType.TOUCH_END, () => this.selectTier(tier), this); + } + this.btn_reset?.on(NodeEventType.TOUCH_END, this.onResetTap, this); + } protected onEnable(): void { + // 升级/重置/加点变动统一走 TALENT_UPDATE 事件驱动全量刷新 + oops.message.on(GameEvent.TALENT_UPDATE, this.refreshUI, this); this.refreshUI(); } - /** 重新拉取最新数据并刷新所有子项 */ + protected onDisable(): void { + oops.message.off(GameEvent.TALENT_UPDATE, this.refreshUI, this); + } + + protected onDestroy(): void { + for (const [, tab] of this.tabNodes) { + tab.node?.targetOff(this); + } + this.btn_reset?.targetOff(this); + } + + /** 切换阶位页签：锁定阶允许查看（卡片呈锁定态），并提示解锁条件 */ + private selectTier(tier: TalentTier): void { + if (tier === this.curTier) return; + this.curTier = tier; + const levels = smc.getTalentLevels(); + if (!isTalentTierUnlocked(levels, tier)) { + const prev = tier - 1; + const invested = getTalentTierInvestedPoints(levels, prev); + oops.gui.toast(`${TIER_TAB_TEXT[tier].lockName}投入 ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD} 点解锁本阶`); + } + this.refreshUI(); + } + + /** 全量刷新：页头点数 + 页签解锁进度 + 当前阶位卡片列表 */ public refreshUI(): void { if (!this.talents_content || !this.prefab_talent_item) return; + const levels = smc.getTalentLevels(); - // 第一次：实例化所有子节点 - if (!this.rendered) { - // 获取所有天赋（技能卡）并按 wave 和 uuid 排序 - this.cachedConfigs = [...SkillCardList] - .sort((a, b) => { - const waveA = a.wave || 1; - const waveB = b.wave || 1; - if (waveA !== waveB) return waveA - waveB; - return a.uuid - b.uuid; - }); + if (this.lbl_points) this.lbl_points.string = `天赋点 ${smc.getTalentPoints()}`; - this.cachedConfigs.forEach((cfg) => { - const itemNode = instantiate(this.prefab_talent_item); - this.talents_content.addChild(itemNode); - const comp = itemNode.getComponent(TalentItemComp); - if (comp) { - comp.updateItem(cfg); - } - }); - this.rendered = true; - - // 动态调整容器高度 - // 默认底高 1000，每行 3 个天赋信息卡，每张卡高 270，行间距 15 - const totalCount = this.cachedConfigs.length; - const rows = Math.ceil(totalCount / 3); - const contentHeight = Math.max(1000, rows * 270 + (rows > 0 ? (rows - 1) * 15 : 0 + 50)); - - const uiTransform = this.talents_content.getComponent(UITransform); - if (uiTransform) { - uiTransform.height = contentHeight; - } - } else { - // 如果已渲染，则仅更新数据（图鉴一般不会变动，这里做个兜底更新） - this.cachedConfigs.forEach((cfg, index) => { - const child = this.talents_content.children[index]; - if (!child) return; - const comp = child.getComponent(TalentItemComp); - if (!comp) return; - comp.updateItem(cfg); - }); + // 仅首次进入时默认选中已解锁的最高阶，后续刷新保持玩家当前选择 + if (!this.inited) { + this.inited = true; + if (isTalentTierUnlocked(levels, TalentTier.Super)) this.curTier = TalentTier.Super; + else if (isTalentTierUnlocked(levels, TalentTier.Specialized)) this.curTier = TalentTier.Specialized; } + + this.refreshTabs(levels); + this.refreshGrid(levels); + } + + /** 页签文案 + 解锁进度 + 选中高亮（sp_on 子节点可选） */ + private refreshTabs(levels: Record): void { + for (const [tier, tab] of this.tabNodes) { + const text = TIER_TAB_TEXT[tier]; + if (tab.label) { + if (tier === TalentTier.Basic) { + tab.label.string = text.title; + } else { + const unlocked = isTalentTierUnlocked(levels, tier); + const invested = getTalentTierInvestedPoints(levels, (tier - 1) as TalentTier); + tab.label.string = unlocked ? text.title : `${text.title} ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD}`; + } + } + tab.node?.getChildByName(TAB_SELECTED_CHILD)?.setPosition(0, 0); + tab.node?.getChildByName(TAB_SELECTED_CHILD) && (tab.node.getChildByName(TAB_SELECTED_CHILD)!.active = tier === this.curTier); + } + } + + /** 重建当前阶位的卡片列表（每阶 ≤10 条，直接全量实例化） */ + private refreshGrid(levels: Record): void { + this.talents_content.removeAllChildren(); + const unlocked = isTalentTierUnlocked(levels, this.curTier); + const points = smc.getTalentPoints(); + const cfgs = Object.values(TalentSet) + .filter(cfg => cfg.tier === this.curTier) + .sort((a, b) => a.uuid - b.uuid); + + let cardHeight = 0; + for (const cfg of cfgs) { + const lv = levels[cfg.uuid] ?? 0; + const cost = getTalentUpgradeCost(lv); + // 可升级 = 阶位解锁 + 未满级 + 点数足够（+ 徽标显示依据） + const canUp = unlocked && lv < cfg.max_lv && cost > 0 && points >= cost; + + const itemNode = instantiate(this.prefab_talent_item); + this.talents_content.addChild(itemNode); + const comp = itemNode.getComponent(TalentItemComp); + if (!comp) continue; + comp.updateItem(cfg, lv, unlocked, canUp); + comp.onTalentTap = (uuid: number) => this.onTalentTap(uuid); + if (!cardHeight) cardHeight = itemNode.getComponent(UITransform)?.height ?? 0; + } + + // Grid 三列手算容器高度（与旧版图鉴页口径一致，spacing 15 / 上下 padding 15） + const rows = Math.ceil(cfgs.length / 3); + if (cardHeight > 0 && rows > 0) { + const contentHeight = rows * cardHeight + (rows - 1) * 15 + 30; + const uiTransform = this.talents_content.getComponent(UITransform); + if (uiTransform) uiTransform.height = contentHeight; + } + } + + /** 卡片点击统一入口：阶位未解锁/已满级/点数不足分别 toast，成功升级由事件驱动刷新 */ + private onTalentTap(uuid: number): void { + const cfg = TalentSet[uuid]; + if (!cfg) return; + const levels = smc.getTalentLevels(); + + if (!isTalentTierUnlocked(levels, cfg.tier)) { + const invested = getTalentTierInvestedPoints(levels, (cfg.tier - 1) as TalentTier); + oops.gui.toast(`${TIER_TAB_TEXT[cfg.tier].lockName}投入 ${invested}/${TALENT_TIER_UNLOCK_THRESHOLD} 点解锁本阶`); + return; + } + if (smc.getTalentLv(uuid) >= cfg.max_lv) { + oops.gui.toast("该天赋已满级"); + return; + } + if (!smc.upgradeTalent(uuid)) { + oops.gui.toast("天赋点不足"); + } + } + + /** 看广告重置入口：CommonPrompt 二次确认（广告接入前先直接确认重置） */ + private onResetTap(): void { + oops.gui.open(UIID.Window, { + title: "重置天赋", + content: "观看广告后重置所有天赋等级，并全额退还已消耗的天赋点。是否继续？", + okWord: "重置", + cancelWord: "取消", + needCancel: true, + okFunc: () => smc.resetTalents(), + }); } /** ECS 组件移除时销毁节点 */ reset() { - this.rendered = false; - this.cachedConfigs = []; this.node.destroy(); } - - protected onDestroy(): void { - super.onDestroy(); - mLogger.log(this.debugMode, 'TalentsComp', "释放界面"); - } }