diff --git a/assets/resources/gui/element/MSkillBox.prefab b/assets/resources/gui/element/MSkillBox.prefab index 729b5afc..0fbc69bf 100644 --- a/assets/resources/gui/element/MSkillBox.prefab +++ b/assets/resources/gui/element/MSkillBox.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 547 + "__id__": 625 }, { - "__id__": 549 + "__id__": 627 }, { - "__id__": 551 + "__id__": 629 } ], "_prefab": { - "__id__": 553 + "__id__": 631 }, "_lpos": { "__type__": "cc.Vec3", @@ -263,35 +263,35 @@ "__id__": 25 }, { - "__id__": 184 + "__id__": 210 }, { - "__id__": 336 + "__id__": 388 }, { - "__id__": 488 + "__id__": 566 }, { - "__id__": 532 + "__id__": 610 } ], "_active": true, "_components": [ { - "__id__": 538 + "__id__": 616 }, { - "__id__": 540 + "__id__": 618 }, { - "__id__": 542 + "__id__": 620 }, { - "__id__": 544 + "__id__": 622 } ], "_prefab": { - "__id__": 546 + "__id__": 624 }, "_lpos": { "__type__": "cc.Vec3", @@ -747,11 +747,62 @@ }, { "__id__": 181 + }, + { + "__id__": 183 + }, + { + "__id__": 185 + }, + { + "__id__": 187 + }, + { + "__id__": 188 + }, + { + "__id__": 190 + }, + { + "__id__": 192 + }, + { + "__id__": 193 + }, + { + "__id__": 194 + }, + { + "__id__": 196 + }, + { + "__id__": 197 + }, + { + "__id__": 198 + }, + { + "__id__": 200 + }, + { + "__id__": 201 + }, + { + "__id__": 203 + }, + { + "__id__": 204 + }, + { + "__id__": 205 + }, + { + "__id__": 207 } ], "removedComponents": [ { - "__id__": 183 + "__id__": 209 } ] }, @@ -922,8 +973,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 30 + "width": 180, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -961,10 +1012,10 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, + "_actualFontSize": 31, + "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 30, + "_lineHeight": 35, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -1020,7 +1071,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 161.724, + "_top": 156.724, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -2804,7 +2855,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -92.5, + "y": -86.209, "z": 0 }, "_lrot": { @@ -2894,8 +2945,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 150, - "height": 70 + "width": 180, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2930,13 +2981,13 @@ "b": 255, "a": 255 }, - "_string": "全体英雄攻击+5\n全体英雄攻击+5", + "_string": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 21, - "_fontSize": 35, + "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 25, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -3004,7 +3055,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 55 + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3589,6 +3640,247 @@ "08p7XmUnpCJKHgFSs+XBKi" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 184 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b3jvDRk1NNjL5FE2pyUByW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1DUjdrfNI6Jnt+H+dT4VQ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 186 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -86.209, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 189 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "04ezZAIwpMILD/Ud9I1U8e" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 191 + }, + "propertyPath": [ + "_bottom" + ], + "value": 15 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44+IROys5PuKgmdcm3drG9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 155 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 157 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 195 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 20 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f1pCCS+WJHzLcHGlDyOnNC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 195 + }, + "propertyPath": [ + "_string" + ], + "value": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 195 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 21 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 199 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 80 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "07wtk+PyVP7aan0ss2pOZR" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 195 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 30 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4e0zRmCsdP1KUAjhXlJYQl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 202 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 35 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 206 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 40 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "38lsWFSERI8rUY2mPAdfSn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 208 + }, + "propertyPath": [ + "_top" + ], + "value": 156.724 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "877cNZnZNFeIjRDtOh3mV6" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -3602,14 +3894,14 @@ "__id__": 10 }, "_prefab": { - "__id__": 185 + "__id__": 211 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 184 + "__id__": 210 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -3617,7 +3909,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 186 + "__id__": 212 }, "targetOverrides": null }, @@ -3630,49 +3922,10 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 187 + "__id__": 213 } ], "propertyOverrides": [ - { - "__id__": 291 - }, - { - "__id__": 293 - }, - { - "__id__": 295 - }, - { - "__id__": 297 - }, - { - "__id__": 299 - }, - { - "__id__": 301 - }, - { - "__id__": 303 - }, - { - "__id__": 305 - }, - { - "__id__": 307 - }, - { - "__id__": 309 - }, - { - "__id__": 311 - }, - { - "__id__": 313 - }, - { - "__id__": 315 - }, { "__id__": 317 }, @@ -3699,25 +3952,115 @@ }, { "__id__": 333 + }, + { + "__id__": 335 + }, + { + "__id__": 337 + }, + { + "__id__": 339 + }, + { + "__id__": 341 + }, + { + "__id__": 343 + }, + { + "__id__": 345 + }, + { + "__id__": 347 + }, + { + "__id__": 349 + }, + { + "__id__": 351 + }, + { + "__id__": 353 + }, + { + "__id__": 355 + }, + { + "__id__": 357 + }, + { + "__id__": 359 + }, + { + "__id__": 361 + }, + { + "__id__": 363 + }, + { + "__id__": 365 + }, + { + "__id__": 367 + }, + { + "__id__": 369 + }, + { + "__id__": 370 + }, + { + "__id__": 371 + }, + { + "__id__": 372 + }, + { + "__id__": 374 + }, + { + "__id__": 375 + }, + { + "__id__": 376 + }, + { + "__id__": 378 + }, + { + "__id__": 379 + }, + { + "__id__": 381 + }, + { + "__id__": 382 + }, + { + "__id__": 383 + }, + { + "__id__": 385 } ], "removedComponents": [ { - "__id__": 335 + "__id__": 387 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 188 + "__id__": 214 }, "components": [ { - "__id__": 189 + "__id__": 215 }, { - "__id__": 191 + "__id__": 217 } ] }, @@ -3733,15 +4076,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 184 + "__id__": 210 } }, "node": { - "__id__": 184 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 216 }, "_alignFlags": 17, "_target": null, @@ -3773,33 +4116,33 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 184 + "__id__": 210 } }, "node": { - "__id__": 184 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 218 }, "name_node": { - "__id__": 193 + "__id__": 219 }, "icon_node": { - "__id__": 201 + "__id__": 227 }, "cost_node": { - "__id__": 217 + "__id__": 243 }, "Ckind_node": { - "__id__": 237 + "__id__": 263 }, "BG_node": { - "__id__": 267 + "__id__": 293 }, "info_node": { - "__id__": 279 + "__id__": 305 }, "_id": "" }, @@ -3813,23 +4156,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 220 }, { - "__id__": 196 + "__id__": 222 }, { - "__id__": 198 + "__id__": 224 } ], "_prefab": { - "__id__": 200 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -3866,16 +4209,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 221 }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 30 + "width": 180, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3894,11 +4237,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 223 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3913,10 +4256,10 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, + "_actualFontSize": 31, + "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 30, + "_lineHeight": 35, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -3962,17 +4305,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 225 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 161.724, + "_top": 156.724, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -4011,20 +4354,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 228 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 238 }, { - "__id__": 214 + "__id__": 240 } ], "_prefab": { - "__id__": 216 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -4061,30 +4404,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [ { - "__id__": 201 + "__id__": 227 } ], "_active": true, "_components": [ { - "__id__": 203 + "__id__": 229 }, { - "__id__": 205 + "__id__": 231 }, { - "__id__": 207 + "__id__": 233 }, { - "__id__": 209 + "__id__": 235 } ], "_prefab": { - "__id__": 211 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -4121,11 +4464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4149,11 +4492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 232 }, "_type": 3, "_inverted": false, @@ -4171,11 +4514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 234 }, "_alignFlags": 41, "_target": null, @@ -4207,11 +4550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4268,11 +4611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -4296,11 +4639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4354,30 +4697,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [ { - "__id__": 218 + "__id__": 244 }, { - "__id__": 224 + "__id__": 250 } ], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 256 }, { - "__id__": 232 + "__id__": 258 }, { - "__id__": 234 + "__id__": 260 } ], "_prefab": { - "__id__": 236 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -4414,20 +4757,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 217 + "__id__": 243 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 245 }, { - "__id__": 221 + "__id__": 247 } ], "_prefab": { - "__id__": 223 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -4464,11 +4807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -4492,11 +4835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4553,20 +4896,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 217 + "__id__": 243 }, "_children": [], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 251 }, { - "__id__": 227 + "__id__": 253 } ], "_prefab": { - "__id__": 229 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -4603,11 +4946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -4631,11 +4974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 254 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4712,11 +5055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 257 }, "_contentSize": { "__type__": "cc.Size", @@ -4740,11 +5083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 259 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4782,11 +5125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 261 }, "_alignFlags": 33, "_target": null, @@ -4831,33 +5174,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [ { - "__id__": 238 + "__id__": 264 }, { - "__id__": 244 + "__id__": 270 }, { - "__id__": 250 + "__id__": 276 }, { - "__id__": 256 + "__id__": 282 } ], "_active": true, "_components": [ { - "__id__": 262 + "__id__": 288 }, { - "__id__": 264 + "__id__": 290 } ], "_prefab": { - "__id__": 266 + "__id__": 292 }, "_lpos": { "__type__": "cc.Vec3", @@ -4894,20 +5237,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 265 }, { - "__id__": 241 + "__id__": 267 } ], "_prefab": { - "__id__": 243 + "__id__": 269 }, "_lpos": { "__type__": "cc.Vec3", @@ -4944,11 +5287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", @@ -4972,11 +5315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5030,20 +5373,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 271 }, { - "__id__": 247 + "__id__": 273 } ], "_prefab": { - "__id__": 249 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -5080,11 +5423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5108,11 +5451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 244 + "__id__": 270 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 274 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5169,20 +5512,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 277 }, { - "__id__": 253 + "__id__": 279 } ], "_prefab": { - "__id__": 255 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -5219,11 +5562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 278 }, "_contentSize": { "__type__": "cc.Size", @@ -5247,11 +5590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 280 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5308,20 +5651,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 237 + "__id__": 263 }, "_children": [], "_active": true, "_components": [ { - "__id__": 257 + "__id__": 283 }, { - "__id__": 259 + "__id__": 285 } ], "_prefab": { - "__id__": 261 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -5358,11 +5701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -5386,11 +5729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5447,11 +5790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 289 }, "_contentSize": { "__type__": "cc.Size", @@ -5475,11 +5818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 291 }, "_alignFlags": 9, "_target": null, @@ -5524,36 +5867,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [ { - "__id__": 268 + "__id__": 294 }, { - "__id__": 269 + "__id__": 295 }, { - "__id__": 270 + "__id__": 296 }, { - "__id__": 271 + "__id__": 297 } ], "_active": true, "_components": [ { - "__id__": 272 + "__id__": 298 }, { - "__id__": 274 + "__id__": 300 }, { - "__id__": 276 + "__id__": 302 } ], "_prefab": { - "__id__": 278 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -5606,11 +5949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -5634,11 +5977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 293 }, "_enabled": false, "__prefab": { - "__id__": 275 + "__id__": 301 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5682,11 +6025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 267 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 303 }, "_alignFlags": 45, "_target": null, @@ -5731,29 +6074,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 210 }, "_children": [ { - "__id__": 280 + "__id__": 306 } ], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 312 }, { - "__id__": 288 + "__id__": 314 } ], "_prefab": { - "__id__": 290 + "__id__": 316 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -92.5, + "y": -86.209, "z": 0 }, "_lrot": { @@ -5785,20 +6128,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 279 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 307 }, { - "__id__": 283 + "__id__": 309 } ], "_prefab": { - "__id__": 285 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -5835,16 +6178,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", - "width": 150, - "height": 70 + "width": 180, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5863,11 +6206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5879,13 +6222,13 @@ "b": 255, "a": 255 }, - "_string": "全体英雄攻击+5\n全体英雄攻击+5", + "_string": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 21, - "_fontSize": 35, + "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 25, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -5944,16 +6287,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 313 }, "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 55 + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5972,11 +6315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 305 }, "_enabled": false, "__prefab": { - "__id__": 289 + "__id__": 315 }, "_alignFlags": 45, "_target": null, @@ -6018,7 +6361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 292 + "__id__": 318 }, "propertyPath": [ "_name" @@ -6034,7 +6377,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 294 + "__id__": 320 }, "propertyPath": [ "_lpos" @@ -6055,7 +6398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 296 + "__id__": 322 }, "propertyPath": [ "_lrot" @@ -6077,7 +6420,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_euler" @@ -6098,7 +6441,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 300 + "__id__": 326 }, "propertyPath": [ "_active" @@ -6114,7 +6457,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 302 + "__id__": 328 }, "propertyPath": [ "_contentSize" @@ -6134,7 +6477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 304 + "__id__": 330 }, "propertyPath": [ "_contentSize" @@ -6154,7 +6497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 332 }, "propertyPath": [ "_lpos" @@ -6175,7 +6518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 308 + "__id__": 334 }, "propertyPath": [ "_lpos" @@ -6196,7 +6539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 336 }, "propertyPath": [ "_contentSize" @@ -6216,7 +6559,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 312 + "__id__": 338 }, "propertyPath": [ "_lpos" @@ -6237,7 +6580,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 314 + "__id__": 340 }, "propertyPath": [ "_lpos" @@ -6258,7 +6601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 316 + "__id__": 342 }, "propertyPath": [ "_lpos" @@ -6279,7 +6622,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 344 }, "propertyPath": [ "_lpos" @@ -6300,7 +6643,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 320 + "__id__": 346 }, "propertyPath": [ "_contentSize" @@ -6320,7 +6663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 322 + "__id__": 348 }, "propertyPath": [ "_contentSize" @@ -6341,7 +6684,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 324 + "__id__": 350 }, "propertyPath": [ "_contentSize" @@ -6362,7 +6705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 326 + "__id__": 352 }, "propertyPath": [ "_contentSize" @@ -6383,7 +6726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 328 + "__id__": 354 }, "propertyPath": [ "_contentSize" @@ -6404,7 +6747,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 330 + "__id__": 356 }, "propertyPath": [ "_contentSize" @@ -6425,7 +6768,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 332 + "__id__": 358 }, "propertyPath": [ "_contentSize" @@ -6446,7 +6789,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 334 + "__id__": 360 }, "propertyPath": [ "_lpos" @@ -6465,6 +6808,247 @@ "69ZX4yvCZL67xK4+SdFMO0" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 362 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b3jvDRk1NNjL5FE2pyUByW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 364 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1DUjdrfNI6Jnt+H+dT4VQ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 366 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "04ezZAIwpMILD/Ud9I1U8e" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 368 + }, + "propertyPath": [ + "_bottom" + ], + "value": 15 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44+IROys5PuKgmdcm3drG9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 364 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -86.209, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 342 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 340 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 373 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 20 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f1pCCS+WJHzLcHGlDyOnNC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 373 + }, + "propertyPath": [ + "_string" + ], + "value": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 373 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 21 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 377 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 80 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "07wtk+PyVP7aan0ss2pOZR" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 373 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 380 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 30 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4e0zRmCsdP1KUAjhXlJYQl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 380 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 380 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 35 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 384 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 40 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "38lsWFSERI8rUY2mPAdfSn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 386 + }, + "propertyPath": [ + "_top" + ], + "value": 156.724 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "877cNZnZNFeIjRDtOh3mV6" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -6478,14 +7062,14 @@ "__id__": 10 }, "_prefab": { - "__id__": 337 + "__id__": 389 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 336 + "__id__": 388 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -6493,7 +7077,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 338 + "__id__": 390 }, "targetOverrides": null }, @@ -6506,94 +7090,145 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 339 + "__id__": 391 } ], "propertyOverrides": [ { - "__id__": 443 + "__id__": 495 }, { - "__id__": 445 + "__id__": 497 }, { - "__id__": 447 + "__id__": 499 }, { - "__id__": 449 + "__id__": 501 }, { - "__id__": 451 + "__id__": 503 }, { - "__id__": 453 + "__id__": 505 }, { - "__id__": 455 + "__id__": 507 }, { - "__id__": 457 + "__id__": 509 }, { - "__id__": 459 + "__id__": 511 }, { - "__id__": 461 + "__id__": 513 }, { - "__id__": 463 + "__id__": 515 }, { - "__id__": 465 + "__id__": 517 }, { - "__id__": 467 + "__id__": 519 }, { - "__id__": 469 + "__id__": 521 }, { - "__id__": 471 + "__id__": 523 }, { - "__id__": 473 + "__id__": 525 }, { - "__id__": 475 + "__id__": 527 }, { - "__id__": 477 + "__id__": 529 }, { - "__id__": 479 + "__id__": 531 }, { - "__id__": 481 + "__id__": 533 }, { - "__id__": 483 + "__id__": 535 }, { - "__id__": 485 + "__id__": 537 + }, + { + "__id__": 539 + }, + { + "__id__": 541 + }, + { + "__id__": 543 + }, + { + "__id__": 545 + }, + { + "__id__": 547 + }, + { + "__id__": 548 + }, + { + "__id__": 549 + }, + { + "__id__": 550 + }, + { + "__id__": 552 + }, + { + "__id__": 553 + }, + { + "__id__": 554 + }, + { + "__id__": 556 + }, + { + "__id__": 557 + }, + { + "__id__": 559 + }, + { + "__id__": 560 + }, + { + "__id__": 561 + }, + { + "__id__": 563 } ], "removedComponents": [ { - "__id__": 487 + "__id__": 565 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 340 + "__id__": 392 }, "components": [ { - "__id__": 341 + "__id__": 393 }, { - "__id__": 343 + "__id__": 395 } ] }, @@ -6609,15 +7244,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 336 + "__id__": 388 } }, "node": { - "__id__": 336 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 394 }, "_alignFlags": 33, "_target": null, @@ -6649,33 +7284,33 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 336 + "__id__": 388 } }, "node": { - "__id__": 336 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 396 }, "name_node": { - "__id__": 345 + "__id__": 397 }, "icon_node": { - "__id__": 353 + "__id__": 405 }, "cost_node": { - "__id__": 369 + "__id__": 421 }, "Ckind_node": { - "__id__": 389 + "__id__": 441 }, "BG_node": { - "__id__": 419 + "__id__": 471 }, "info_node": { - "__id__": 431 + "__id__": 483 }, "_id": "" }, @@ -6689,23 +7324,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 398 }, { - "__id__": 348 + "__id__": 400 }, { - "__id__": 350 + "__id__": 402 } ], "_prefab": { - "__id__": 352 + "__id__": 404 }, "_lpos": { "__type__": "cc.Vec3", @@ -6742,16 +7377,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 399 }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 30 + "width": 180, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6770,11 +7405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 401 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6789,10 +7424,10 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 25, - "_fontSize": 25, + "_actualFontSize": 31, + "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 30, + "_lineHeight": 35, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -6838,17 +7473,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 403 }, "_alignFlags": 17, "_target": null, "_left": 0, "_right": 0, - "_top": 161.724, + "_top": 156.724, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6887,20 +7522,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 354 + "__id__": 406 }, "_children": [], "_active": true, "_components": [ { - "__id__": 364 + "__id__": 416 }, { - "__id__": 366 + "__id__": 418 } ], "_prefab": { - "__id__": 368 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -6937,30 +7572,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [ { - "__id__": 353 + "__id__": 405 } ], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 407 }, { - "__id__": 357 + "__id__": 409 }, { - "__id__": 359 + "__id__": 411 }, { - "__id__": 361 + "__id__": 413 } ], "_prefab": { - "__id__": 363 + "__id__": 415 }, "_lpos": { "__type__": "cc.Vec3", @@ -6997,11 +7632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 408 }, "_contentSize": { "__type__": "cc.Size", @@ -7025,11 +7660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 410 }, "_type": 3, "_inverted": false, @@ -7047,11 +7682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 412 }, "_alignFlags": 41, "_target": null, @@ -7083,11 +7718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 414 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7144,11 +7779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 405 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 417 }, "_contentSize": { "__type__": "cc.Size", @@ -7172,11 +7807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 405 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 419 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7230,30 +7865,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [ { - "__id__": 370 + "__id__": 422 }, { - "__id__": 376 + "__id__": 428 } ], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 434 }, { - "__id__": 384 + "__id__": 436 }, { - "__id__": 386 + "__id__": 438 } ], "_prefab": { - "__id__": 388 + "__id__": 440 }, "_lpos": { "__type__": "cc.Vec3", @@ -7290,20 +7925,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 369 + "__id__": 421 }, "_children": [], "_active": true, "_components": [ { - "__id__": 371 + "__id__": 423 }, { - "__id__": 373 + "__id__": 425 } ], "_prefab": { - "__id__": 375 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", @@ -7340,11 +7975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 370 + "__id__": 422 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 424 }, "_contentSize": { "__type__": "cc.Size", @@ -7368,11 +8003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 370 + "__id__": 422 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 426 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7429,20 +8064,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 369 + "__id__": 421 }, "_children": [], "_active": true, "_components": [ { - "__id__": 377 + "__id__": 429 }, { - "__id__": 379 + "__id__": 431 } ], "_prefab": { - "__id__": 381 + "__id__": 433 }, "_lpos": { "__type__": "cc.Vec3", @@ -7479,11 +8114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", @@ -7507,11 +8142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 376 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 432 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7588,11 +8223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 435 }, "_contentSize": { "__type__": "cc.Size", @@ -7616,11 +8251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 437 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7658,11 +8293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 439 }, "_alignFlags": 33, "_target": null, @@ -7707,33 +8342,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [ { - "__id__": 390 + "__id__": 442 }, { - "__id__": 396 + "__id__": 448 }, { - "__id__": 402 + "__id__": 454 }, { - "__id__": 408 + "__id__": 460 } ], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 466 }, { - "__id__": 416 + "__id__": 468 } ], "_prefab": { - "__id__": 418 + "__id__": 470 }, "_lpos": { "__type__": "cc.Vec3", @@ -7770,20 +8405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 441 }, "_children": [], "_active": true, "_components": [ { - "__id__": 391 + "__id__": 443 }, { - "__id__": 393 + "__id__": 445 } ], "_prefab": { - "__id__": 395 + "__id__": 447 }, "_lpos": { "__type__": "cc.Vec3", @@ -7820,11 +8455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 442 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 444 }, "_contentSize": { "__type__": "cc.Size", @@ -7848,11 +8483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 442 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 446 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7906,20 +8541,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 441 }, "_children": [], "_active": true, "_components": [ { - "__id__": 397 + "__id__": 449 }, { - "__id__": 399 + "__id__": 451 } ], "_prefab": { - "__id__": 401 + "__id__": 453 }, "_lpos": { "__type__": "cc.Vec3", @@ -7956,11 +8591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 450 }, "_contentSize": { "__type__": "cc.Size", @@ -7984,11 +8619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 452 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8045,20 +8680,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 441 }, "_children": [], "_active": true, "_components": [ { - "__id__": 403 + "__id__": 455 }, { - "__id__": 405 + "__id__": 457 } ], "_prefab": { - "__id__": 407 + "__id__": 459 }, "_lpos": { "__type__": "cc.Vec3", @@ -8095,11 +8730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 454 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 456 }, "_contentSize": { "__type__": "cc.Size", @@ -8123,11 +8758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 454 }, "_enabled": true, "__prefab": { - "__id__": 406 + "__id__": 458 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8184,20 +8819,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 441 }, "_children": [], "_active": true, "_components": [ { - "__id__": 409 + "__id__": 461 }, { - "__id__": 411 + "__id__": 463 } ], "_prefab": { - "__id__": 413 + "__id__": 465 }, "_lpos": { "__type__": "cc.Vec3", @@ -8234,11 +8869,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 460 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 462 }, "_contentSize": { "__type__": "cc.Size", @@ -8262,11 +8897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 408 + "__id__": 460 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 464 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8323,11 +8958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 467 }, "_contentSize": { "__type__": "cc.Size", @@ -8351,11 +8986,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 441 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 469 }, "_alignFlags": 9, "_target": null, @@ -8400,36 +9035,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [ { - "__id__": 420 + "__id__": 472 }, { - "__id__": 421 + "__id__": 473 }, { - "__id__": 422 + "__id__": 474 }, { - "__id__": 423 + "__id__": 475 } ], "_active": true, "_components": [ { - "__id__": 424 + "__id__": 476 }, { - "__id__": 426 + "__id__": 478 }, { - "__id__": 428 + "__id__": 480 } ], "_prefab": { - "__id__": 430 + "__id__": 482 }, "_lpos": { "__type__": "cc.Vec3", @@ -8482,11 +9117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 477 }, "_contentSize": { "__type__": "cc.Size", @@ -8510,11 +9145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 471 }, "_enabled": false, "__prefab": { - "__id__": 427 + "__id__": 479 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8558,11 +9193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 419 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 481 }, "_alignFlags": 45, "_target": null, @@ -8607,29 +9242,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 388 }, "_children": [ { - "__id__": 432 + "__id__": 484 } ], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 490 }, { - "__id__": 440 + "__id__": 492 } ], "_prefab": { - "__id__": 442 + "__id__": 494 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -92.5, + "y": -86.209, "z": 0 }, "_lrot": { @@ -8661,20 +9296,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 431 + "__id__": 483 }, "_children": [], "_active": true, "_components": [ { - "__id__": 433 + "__id__": 485 }, { - "__id__": 435 + "__id__": 487 } ], "_prefab": { - "__id__": 437 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -8711,16 +9346,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 434 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", - "width": 150, - "height": 70 + "width": 180, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8739,11 +9374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 432 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8755,13 +9390,13 @@ "b": 255, "a": 255 }, - "_string": "全体英雄攻击+5\n全体英雄攻击+5", + "_string": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 21, - "_fontSize": 35, + "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 25, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -8820,16 +9455,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 483 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 491 }, "_contentSize": { "__type__": "cc.Size", "width": 170, - "height": 55 + "height": 90 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8848,11 +9483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 431 + "__id__": 483 }, "_enabled": false, "__prefab": { - "__id__": 441 + "__id__": 493 }, "_alignFlags": 45, "_target": null, @@ -8894,7 +9529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 444 + "__id__": 496 }, "propertyPath": [ "_name" @@ -8910,7 +9545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 446 + "__id__": 498 }, "propertyPath": [ "_lpos" @@ -8931,7 +9566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 448 + "__id__": 500 }, "propertyPath": [ "_lrot" @@ -8953,7 +9588,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 450 + "__id__": 502 }, "propertyPath": [ "_euler" @@ -8974,7 +9609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 452 + "__id__": 504 }, "propertyPath": [ "_active" @@ -8990,7 +9625,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 454 + "__id__": 506 }, "propertyPath": [ "_contentSize" @@ -9010,7 +9645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 456 + "__id__": 508 }, "propertyPath": [ "_contentSize" @@ -9030,7 +9665,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 458 + "__id__": 510 }, "propertyPath": [ "_lpos" @@ -9051,7 +9686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 460 + "__id__": 512 }, "propertyPath": [ "_lpos" @@ -9072,7 +9707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 462 + "__id__": 514 }, "propertyPath": [ "_contentSize" @@ -9092,7 +9727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 464 + "__id__": 516 }, "propertyPath": [ "_lpos" @@ -9113,7 +9748,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 466 + "__id__": 518 }, "propertyPath": [ "_lpos" @@ -9134,7 +9769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 468 + "__id__": 520 }, "propertyPath": [ "_lpos" @@ -9155,7 +9790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 522 }, "propertyPath": [ "_lpos" @@ -9176,7 +9811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 472 + "__id__": 524 }, "propertyPath": [ "_contentSize" @@ -9196,7 +9831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 474 + "__id__": 526 }, "propertyPath": [ "_contentSize" @@ -9217,7 +9852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 528 }, "propertyPath": [ "_contentSize" @@ -9238,7 +9873,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 530 }, "propertyPath": [ "_contentSize" @@ -9259,7 +9894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 480 + "__id__": 532 }, "propertyPath": [ "_contentSize" @@ -9280,7 +9915,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 482 + "__id__": 534 }, "propertyPath": [ "_contentSize" @@ -9301,7 +9936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 484 + "__id__": 536 }, "propertyPath": [ "_contentSize" @@ -9322,7 +9957,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 486 + "__id__": 538 }, "propertyPath": [ "_lpos" @@ -9341,6 +9976,247 @@ "69ZX4yvCZL67xK4+SdFMO0" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 540 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b3jvDRk1NNjL5FE2pyUByW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 542 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1DUjdrfNI6Jnt+H+dT4VQ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 544 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 170, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "04ezZAIwpMILD/Ud9I1U8e" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 546 + }, + "propertyPath": [ + "_bottom" + ], + "value": 15 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44+IROys5PuKgmdcm3drG9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 542 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -86.209, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 518 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 520 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 551 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 20 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f1pCCS+WJHzLcHGlDyOnNC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 551 + }, + "propertyPath": [ + "_string" + ], + "value": "全体英雄攻击+5全体英雄攻击+5全体英雄攻击+5" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 551 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 21 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 555 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 80 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "07wtk+PyVP7aan0ss2pOZR" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 551 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_fontSize" + ], + "value": 30 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4e0zRmCsdP1KUAjhXlJYQl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_actualFontSize" + ], + "value": 25 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_lineHeight" + ], + "value": 35 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 562 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 40 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "38lsWFSERI8rUY2mPAdfSn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 564 + }, + "propertyPath": [ + "_top" + ], + "value": 156.724 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "877cNZnZNFeIjRDtOh3mV6" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -9357,26 +10233,26 @@ }, "_children": [ { - "__id__": 489 + "__id__": 567 }, { - "__id__": 510 + "__id__": 588 } ], "_active": true, "_components": [ { - "__id__": 525 + "__id__": 603 }, { - "__id__": 527 + "__id__": 605 }, { - "__id__": 529 + "__id__": 607 } ], "_prefab": { - "__id__": 531 + "__id__": 609 }, "_lpos": { "__type__": "cc.Vec3", @@ -9413,30 +10289,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 488 + "__id__": 566 }, "_children": [ { - "__id__": 490 + "__id__": 568 }, { - "__id__": 496 + "__id__": 574 } ], "_active": true, "_components": [ { - "__id__": 502 + "__id__": 580 }, { - "__id__": 504 + "__id__": 582 }, { - "__id__": 506 + "__id__": 584 } ], "_prefab": { - "__id__": 509 + "__id__": 587 }, "_lpos": { "__type__": "cc.Vec3", @@ -9473,20 +10349,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 489 + "__id__": 567 }, "_children": [], "_active": true, "_components": [ { - "__id__": 491 + "__id__": 569 }, { - "__id__": 493 + "__id__": 571 } ], "_prefab": { - "__id__": 495 + "__id__": 573 }, "_lpos": { "__type__": "cc.Vec3", @@ -9523,11 +10399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 490 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 570 }, "_contentSize": { "__type__": "cc.Size", @@ -9551,11 +10427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 490 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 494 + "__id__": 572 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9632,20 +10508,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 489 + "__id__": 567 }, "_children": [], "_active": true, "_components": [ { - "__id__": 497 + "__id__": 575 }, { - "__id__": 499 + "__id__": 577 } ], "_prefab": { - "__id__": 501 + "__id__": 579 }, "_lpos": { "__type__": "cc.Vec3", @@ -9682,11 +10558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 496 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 576 }, "_contentSize": { "__type__": "cc.Size", @@ -9710,11 +10586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 496 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 578 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9791,11 +10667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 489 + "__id__": 567 }, "_enabled": true, "__prefab": { - "__id__": 503 + "__id__": 581 }, "_contentSize": { "__type__": "cc.Size", @@ -9819,11 +10695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 489 + "__id__": 567 }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 583 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9867,15 +10743,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 489 + "__id__": 567 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 585 }, "clickEvents": [ { - "__id__": 508 + "__id__": 586 } ], "_interactable": true, @@ -9950,27 +10826,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 488 + "__id__": 566 }, "_children": [ { - "__id__": 511 + "__id__": 589 } ], "_active": true, "_components": [ { - "__id__": 517 + "__id__": 595 }, { - "__id__": 519 + "__id__": 597 }, { - "__id__": 521 + "__id__": 599 } ], "_prefab": { - "__id__": 524 + "__id__": 602 }, "_lpos": { "__type__": "cc.Vec3", @@ -10007,20 +10883,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 510 + "__id__": 588 }, "_children": [], "_active": true, "_components": [ { - "__id__": 512 + "__id__": 590 }, { - "__id__": 514 + "__id__": 592 } ], "_prefab": { - "__id__": 516 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", @@ -10057,11 +10933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 511 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 591 }, "_contentSize": { "__type__": "cc.Size", @@ -10085,11 +10961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 511 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 593 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10166,11 +11042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 596 }, "_contentSize": { "__type__": "cc.Size", @@ -10194,11 +11070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 598 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10242,15 +11118,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 510 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 522 + "__id__": 600 }, "clickEvents": [ { - "__id__": 523 + "__id__": 601 } ], "_interactable": true, @@ -10325,11 +11201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 604 }, "_contentSize": { "__type__": "cc.Size", @@ -10353,11 +11229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 606 }, "_resizeMode": 1, "_layoutType": 1, @@ -10391,11 +11267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 566 }, "_enabled": false, "__prefab": { - "__id__": 530 + "__id__": 608 }, "_alignFlags": 4, "_target": null, @@ -10446,14 +11322,14 @@ "_active": true, "_components": [ { - "__id__": 533 + "__id__": 611 }, { - "__id__": 535 + "__id__": 613 } ], "_prefab": { - "__id__": 537 + "__id__": 615 }, "_lpos": { "__type__": "cc.Vec3", @@ -10490,11 +11366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 532 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 612 }, "_contentSize": { "__type__": "cc.Size", @@ -10518,11 +11394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 532 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 614 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10603,7 +11479,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 617 }, "_contentSize": { "__type__": "cc.Size", @@ -10631,7 +11507,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 619 }, "_alignFlags": 42, "_target": null, @@ -10667,7 +11543,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 543 + "__id__": 621 }, "_resizeMode": 1, "_layoutType": 1, @@ -10705,7 +11581,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 623 }, "_id": "" }, @@ -10736,7 +11612,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 548 + "__id__": 626 }, "_contentSize": { "__type__": "cc.Size", @@ -10764,7 +11640,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 550 + "__id__": 628 }, "_alignFlags": 45, "_target": null, @@ -10800,7 +11676,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 630 }, "_id": "" }, @@ -10820,66 +11696,66 @@ "instance": null, "targetOverrides": [ { - "__id__": 554 + "__id__": 632 }, { - "__id__": 556 + "__id__": 634 }, { - "__id__": 558 + "__id__": 636 }, { - "__id__": 560 + "__id__": 638 }, { - "__id__": 562 + "__id__": 640 }, { - "__id__": 564 + "__id__": 642 }, { - "__id__": 566 + "__id__": 644 }, { - "__id__": 568 + "__id__": 646 }, { - "__id__": 570 + "__id__": 648 }, { - "__id__": 572 + "__id__": 650 }, { - "__id__": 574 + "__id__": 652 }, { - "__id__": 576 + "__id__": 654 }, { - "__id__": 578 + "__id__": 656 }, { - "__id__": 580 + "__id__": 658 }, { - "__id__": 582 + "__id__": 660 }, { - "__id__": 584 + "__id__": 662 }, { - "__id__": 586 + "__id__": 664 }, { - "__id__": 588 + "__id__": 666 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 336 + "__id__": 388 }, { - "__id__": 184 + "__id__": 210 }, { "__id__": 25 @@ -10899,7 +11775,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 555 + "__id__": 633 } }, { @@ -10921,7 +11797,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 557 + "__id__": 635 } }, { @@ -10943,7 +11819,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 559 + "__id__": 637 } }, { @@ -10965,7 +11841,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 561 + "__id__": 639 } }, { @@ -10987,7 +11863,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 563 + "__id__": 641 } }, { @@ -11009,7 +11885,7 @@ "__id__": 25 }, "targetInfo": { - "__id__": 565 + "__id__": 643 } }, { @@ -11021,17 +11897,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "BG_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 567 + "__id__": 645 } }, { @@ -11043,17 +11919,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "icon_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 569 + "__id__": 647 } }, { @@ -11065,17 +11941,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "name_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 571 + "__id__": 649 } }, { @@ -11087,17 +11963,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "cost_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 573 + "__id__": 651 } }, { @@ -11109,17 +11985,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "Ckind_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 575 + "__id__": 653 } }, { @@ -11131,17 +12007,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 191 + "__id__": 217 }, "sourceInfo": null, "propertyPath": [ "info_node" ], "target": { - "__id__": 184 + "__id__": 210 }, "targetInfo": { - "__id__": 577 + "__id__": 655 } }, { @@ -11153,17 +12029,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "name_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 579 + "__id__": 657 } }, { @@ -11175,17 +12051,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "icon_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 581 + "__id__": 659 } }, { @@ -11197,17 +12073,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "BG_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 583 + "__id__": 661 } }, { @@ -11219,17 +12095,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "cost_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 585 + "__id__": 663 } }, { @@ -11241,17 +12117,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "Ckind_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 587 + "__id__": 665 } }, { @@ -11263,17 +12139,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 343 + "__id__": 395 }, "sourceInfo": null, "propertyPath": [ "info_node" ], "target": { - "__id__": 336 + "__id__": 388 }, "targetInfo": { - "__id__": 589 + "__id__": 667 } }, { diff --git a/assets/resources/gui/element/card.prefab b/assets/resources/gui/element/card.prefab index f4fe153c..071c5262 100644 --- a/assets/resources/gui/element/card.prefab +++ b/assets/resources/gui/element/card.prefab @@ -5393,7 +5393,7 @@ "__id__": 296 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 302 @@ -6121,11 +6121,9 @@ "__id__": 10 }, "info_node": { - "__id__": 295 - }, - "lvl_node": { - "__id__": 254 + "__id__": 296 }, + "lvl_node": null, "ap_node": { "__id__": 195 }, diff --git a/assets/script/game/map/SCardComp.ts b/assets/script/game/map/SCardComp.ts index 25250263..34a91ea4 100644 --- a/assets/script/game/map/SCardComp.ts +++ b/assets/script/game/map/SCardComp.ts @@ -258,7 +258,19 @@ export class SCardComp extends CCComp { const spSuffix = card_lv >= 2 ? "★".repeat(card_lv - 1) : ""; this.setLabel(this.name_node, `${spSuffix}${skillCard?.name || skill?.name || ""}${spSuffix}`); - if (this.info_node) this.info_node.active = true; + if (this.info_node) { + this.info_node.active = true; + // 描述优先级：卡牌显式配置 > 关联技能 > 驻场技能 > 卡牌数据兜底 + let desc = skillCard?.info || skill?.info || this.cardData?.info || ""; + if (!desc && this.cardData.field && this.cardData.field.length > 0) { + desc = FieldSkillSet[this.cardData.field[0]]?.info || ""; + } + // 与 HlistComp 保持一致：优先查找名为 "info" 的子节点上的 Label + const infoLabel = this.info_node.getChildByName("info")?.getComponent(Label) + || this.info_node.getComponent(Label) + || this.info_node.getComponentInChildren(Label); + if (infoLabel) infoLabel.string = desc; + } if (this.cost_node) { this.cost_node.active = true;