From afe11291f102cd78d3c71f13deebdb3b2d4edd2d Mon Sep 17 00:00:00 2001 From: walkpan Date: Wed, 25 Mar 2026 23:32:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=8B=B1=E9=9B=84=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E5=B0=86=E8=8B=B1=E9=9B=84=E4=B8=8E=E9=87=91=E5=B8=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E8=87=B3=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 Hero.ts 中手动维护的 hero_num 计数逻辑 - 在 SingletonModuleComp 的 mission_data 中添加 hero_max_num、hero_extend_max_num 字段 - 重构 MissionCardComp，使其通过 smc.vmdata.mission_data 读写英雄数量、金币等状态 - 新增辅助方法统一数据访问与同步，避免状态分散管理 --- assets/resources/gui/role_controller.prefab | 1693 +++++++++-------- .../script/game/common/SingletonModuleComp.ts | 4 +- assets/script/game/hero/Hero.ts | 6 - assets/script/game/map/MissionCardComp.ts | 125 +- 4 files changed, 958 insertions(+), 870 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index a87f2e5e..928709e0 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 519 + "__id__": 523 }, { - "__id__": 655 + "__id__": 659 }, { - "__id__": 664 + "__id__": 668 } ], "_active": true, "_components": [ - { - "__id__": 710 - }, - { - "__id__": 712 - }, { "__id__": 714 + }, + { + "__id__": 716 + }, + { + "__id__": 718 } ], "_prefab": { - "__id__": 716 + "__id__": 720 }, "_lpos": { "__type__": "cc.Vec3", @@ -94,17 +94,11 @@ "__id__": 45 }, { - "__id__": 367 + "__id__": 371 } ], "_active": true, "_components": [ - { - "__id__": 504 - }, - { - "__id__": 506 - }, { "__id__": 508 }, @@ -119,10 +113,16 @@ }, { "__id__": 516 + }, + { + "__id__": 518 + }, + { + "__id__": 520 } ], "_prefab": { - "__id__": 518 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -1055,47 +1055,47 @@ "__id__": 144 }, { - "__id__": 186 + "__id__": 188 }, { - "__id__": 210 + "__id__": 214 }, { - "__id__": 222 + "__id__": 226 }, { - "__id__": 234 + "__id__": 238 }, { - "__id__": 246 + "__id__": 250 }, { - "__id__": 258 + "__id__": 262 }, { - "__id__": 291 + "__id__": 295 }, { - "__id__": 314 + "__id__": 318 }, { - "__id__": 337 + "__id__": 341 } ], "_active": true, "_components": [ - { - "__id__": 360 - }, - { - "__id__": 362 - }, { "__id__": 364 + }, + { + "__id__": 366 + }, + { + "__id__": 368 } ], "_prefab": { - "__id__": 366 + "__id__": 370 }, "_lpos": { "__type__": "cc.Vec3", @@ -3400,14 +3400,14 @@ "_active": true, "_components": [ { - "__id__": 181 + "__id__": 183 }, { - "__id__": 183 + "__id__": 185 } ], "_prefab": { - "__id__": 185 + "__id__": 187 }, "_lpos": { "__type__": "cc.Vec3", @@ -4150,10 +4150,13 @@ }, { "__id__": 178 + }, + { + "__id__": 180 } ], "_prefab": { - "__id__": 180 + "__id__": 182 }, "_lpos": { "__type__": "cc.Vec3", @@ -4198,7 +4201,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52.64501953125, + "width": 105.55029296875, "height": 54.4 }, "_anchorPoint": { @@ -4234,7 +4237,7 @@ "b": 255, "a": 255 }, - "_string": "1 / 5", + "_string": "{{0}}/{{1}}", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 25, @@ -4280,6 +4283,31 @@ "__type__": "cc.CompPrefabInfo", "fileId": "01P1XFffFI0YeiDoBu0o4q" }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 175 + }, + "_enabled": true, + "__prefab": { + "__id__": 181 + }, + "templateMode": true, + "watchPath": "", + "labelType": "cc.Label", + "watchPathArr": [ + "data.mission_data.hero_num", + "data.mission_data.hero_max_num" + ], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "67gp0S7s1LbJrRJxA2hyAY" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -4303,7 +4331,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", @@ -4331,7 +4359,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 186 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4386,26 +4414,26 @@ }, "_children": [ { - "__id__": 187 + "__id__": 189 }, { - "__id__": 193 + "__id__": 195 }, { - "__id__": 199 + "__id__": 201 } ], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 209 }, { - "__id__": 207 + "__id__": 211 } ], "_prefab": { - "__id__": 209 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -4442,20 +4470,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 190 }, { - "__id__": 190 + "__id__": 192 } ], "_prefab": { - "__id__": 192 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -4492,11 +4520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -4520,11 +4548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4581,20 +4609,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 196 }, { - "__id__": 196 + "__id__": 198 } ], "_prefab": { - "__id__": 198 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -4631,11 +4659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -4659,11 +4687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4720,20 +4748,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 202 }, { - "__id__": 202 + "__id__": 204 + }, + { + "__id__": 206 } ], "_prefab": { - "__id__": 204 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -4770,15 +4801,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", - "width": 45.71142578125, + "width": 51.30224609375, "height": 54.4 }, "_anchorPoint": { @@ -4798,11 +4829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4814,7 +4845,7 @@ "b": 255, "a": 255 }, - "_string": "999", + "_string": "{{0}}", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 25, @@ -4860,6 +4891,30 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bdrNNK7thMNZHa9Y2Lvam7" }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 201 + }, + "_enabled": true, + "__prefab": { + "__id__": 207 + }, + "templateMode": true, + "watchPath": "0", + "labelType": "cc.Label", + "watchPathArr": [ + "data.mission_data.coin" + ], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c63uq0wtFICbfJrLh+pZmp" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -4879,11 +4934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 210 }, "_contentSize": { "__type__": "cc.Size", @@ -4907,11 +4962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4966,20 +5021,20 @@ }, "_children": [ { - "__id__": 211 + "__id__": 215 } ], "_active": true, "_components": [ { - "__id__": 217 + "__id__": 221 }, { - "__id__": 219 + "__id__": 223 } ], "_prefab": { - "__id__": 221 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5016,20 +5071,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 210 + "__id__": 214 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 216 }, { - "__id__": 214 + "__id__": 218 } ], "_prefab": { - "__id__": 216 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -5066,11 +5121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -5094,11 +5149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 215 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5152,11 +5207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -5180,11 +5235,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 214 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5242,20 +5297,20 @@ }, "_children": [ { - "__id__": 223 + "__id__": 227 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 233 }, { - "__id__": 231 + "__id__": 235 } ], "_prefab": { - "__id__": 233 + "__id__": 237 }, "_lpos": { "__type__": "cc.Vec3", @@ -5292,20 +5347,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 222 + "__id__": 226 }, "_children": [], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 228 }, { - "__id__": 226 + "__id__": 230 } ], "_prefab": { - "__id__": 228 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -5342,11 +5397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 229 }, "_contentSize": { "__type__": "cc.Size", @@ -5370,11 +5425,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5428,11 +5483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -5456,11 +5511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 222 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5518,20 +5573,20 @@ }, "_children": [ { - "__id__": 235 + "__id__": 239 } ], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 245 }, { - "__id__": 243 + "__id__": 247 } ], "_prefab": { - "__id__": 245 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -5568,20 +5623,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 234 + "__id__": 238 }, "_children": [], "_active": true, "_components": [ { - "__id__": 236 + "__id__": 240 }, { - "__id__": 238 + "__id__": 242 } ], "_prefab": { - "__id__": 240 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -5618,11 +5673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 235 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -5646,11 +5701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 235 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 243 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5704,11 +5759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -5732,11 +5787,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 234 + "__id__": 238 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5794,20 +5849,20 @@ }, "_children": [ { - "__id__": 247 + "__id__": 251 } ], "_active": true, "_components": [ { - "__id__": 253 + "__id__": 257 }, { - "__id__": 255 + "__id__": 259 } ], "_prefab": { - "__id__": 257 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", @@ -5844,20 +5899,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 246 + "__id__": 250 }, "_children": [], "_active": true, "_components": [ { - "__id__": 248 + "__id__": 252 }, { - "__id__": 250 + "__id__": 254 } ], "_prefab": { - "__id__": 252 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -5894,11 +5949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -5922,11 +5977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5980,11 +6035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -6008,11 +6063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6067,14 +6122,14 @@ "__id__": 45 }, "_prefab": { - "__id__": 259 + "__id__": 263 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 258 + "__id__": 262 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -6082,7 +6137,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 260 + "__id__": 264 }, "targetOverrides": null }, @@ -6095,28 +6150,22 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 261 + "__id__": 265 } ], "propertyOverrides": [ - { - "__id__": 271 - }, - { - "__id__": 273 - }, - { - "__id__": 274 - }, { "__id__": 275 }, { - "__id__": 276 + "__id__": 277 }, { "__id__": 278 }, + { + "__id__": 279 + }, { "__id__": 280 }, @@ -6126,17 +6175,23 @@ { "__id__": 284 }, - { - "__id__": 285 - }, { "__id__": 286 }, { - "__id__": 287 + "__id__": 288 }, { "__id__": 289 + }, + { + "__id__": 290 + }, + { + "__id__": 291 + }, + { + "__id__": 293 } ], "removedComponents": [] @@ -6144,11 +6199,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 262 + "__id__": 266 }, "components": [ { - "__id__": 263 + "__id__": 267 } ] }, @@ -6164,15 +6219,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 258 + "__id__": 262 } }, "node": { - "__id__": 264 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 274 }, "_id": "" }, @@ -6182,23 +6237,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 258 + "__id__": 262 }, "_children": [], "_active": false, "_components": [ { - "__id__": 265 + "__id__": 269 + }, + { + "__id__": 271 }, { "__id__": 267 - }, - { - "__id__": 263 } ], "_prefab": { - "__id__": 269 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -6235,11 +6290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6263,11 +6318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6325,7 +6380,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 276 }, "propertyPath": [ "_name" @@ -6341,7 +6396,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 276 }, "propertyPath": [ "_lpos" @@ -6356,7 +6411,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 276 }, "propertyPath": [ "_lrot" @@ -6372,7 +6427,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 276 }, "propertyPath": [ "_euler" @@ -6387,7 +6442,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 277 + "__id__": 281 }, "propertyPath": [ "_lpos" @@ -6408,7 +6463,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 283 }, "propertyPath": [ "_left" @@ -6424,7 +6479,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 281 + "__id__": 285 }, "propertyPath": [ "_lpos" @@ -6445,7 +6500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 283 + "__id__": 287 }, "propertyPath": [ "_left" @@ -6461,7 +6516,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 276 }, "propertyPath": [ "_active" @@ -6471,7 +6526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 279 + "__id__": 283 }, "propertyPath": [ "_bottom" @@ -6481,7 +6536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 283 + "__id__": 287 }, "propertyPath": [ "_bottom" @@ -6491,7 +6546,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 288 + "__id__": 292 }, "propertyPath": [ "_lpos" @@ -6512,7 +6567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 290 + "__id__": 294 }, "propertyPath": [ "_lpos" @@ -6537,14 +6592,14 @@ "__id__": 45 }, "_prefab": { - "__id__": 292 + "__id__": 296 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 291 + "__id__": 295 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -6552,7 +6607,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 293 + "__id__": 297 }, "targetOverrides": null }, @@ -6565,24 +6620,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 294 - }, - { - "__id__": 296 - }, - { - "__id__": 297 - }, { "__id__": 298 }, { - "__id__": 299 + "__id__": 300 }, { "__id__": 301 }, + { + "__id__": 302 + }, { "__id__": 303 }, @@ -6592,17 +6641,23 @@ { "__id__": 307 }, - { - "__id__": 308 - }, { "__id__": 309 }, { - "__id__": 310 + "__id__": 311 }, { "__id__": 312 + }, + { + "__id__": 313 + }, + { + "__id__": 314 + }, + { + "__id__": 316 } ], "removedComponents": [] @@ -6610,7 +6665,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 299 }, "propertyPath": [ "_name" @@ -6626,7 +6681,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 299 }, "propertyPath": [ "_lpos" @@ -6641,7 +6696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 299 }, "propertyPath": [ "_lrot" @@ -6657,7 +6712,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 299 }, "propertyPath": [ "_euler" @@ -6672,7 +6727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 300 + "__id__": 304 }, "propertyPath": [ "_lpos" @@ -6693,7 +6748,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 302 + "__id__": 306 }, "propertyPath": [ "_left" @@ -6709,7 +6764,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 304 + "__id__": 308 }, "propertyPath": [ "_lpos" @@ -6730,7 +6785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 310 }, "propertyPath": [ "_left" @@ -6746,7 +6801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 299 }, "propertyPath": [ "_active" @@ -6756,7 +6811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 302 + "__id__": 306 }, "propertyPath": [ "_bottom" @@ -6766,7 +6821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 310 }, "propertyPath": [ "_bottom" @@ -6776,7 +6831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 315 }, "propertyPath": [ "_lpos" @@ -6797,7 +6852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 313 + "__id__": 317 }, "propertyPath": [ "_lpos" @@ -6822,14 +6877,14 @@ "__id__": 45 }, "_prefab": { - "__id__": 315 + "__id__": 319 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 314 + "__id__": 318 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -6837,7 +6892,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 316 + "__id__": 320 }, "targetOverrides": null }, @@ -6850,24 +6905,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 317 - }, - { - "__id__": 319 - }, - { - "__id__": 320 - }, { "__id__": 321 }, { - "__id__": 322 + "__id__": 323 }, { "__id__": 324 }, + { + "__id__": 325 + }, { "__id__": 326 }, @@ -6877,17 +6926,23 @@ { "__id__": 330 }, - { - "__id__": 331 - }, { "__id__": 332 }, { - "__id__": 333 + "__id__": 334 }, { "__id__": 335 + }, + { + "__id__": 336 + }, + { + "__id__": 337 + }, + { + "__id__": 339 } ], "removedComponents": [] @@ -6895,7 +6950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 322 }, "propertyPath": [ "_name" @@ -6911,7 +6966,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 322 }, "propertyPath": [ "_lpos" @@ -6926,7 +6981,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 322 }, "propertyPath": [ "_lrot" @@ -6942,7 +6997,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 322 }, "propertyPath": [ "_euler" @@ -6957,7 +7012,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 323 + "__id__": 327 }, "propertyPath": [ "_lpos" @@ -6978,7 +7033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 325 + "__id__": 329 }, "propertyPath": [ "_left" @@ -6994,7 +7049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 327 + "__id__": 331 }, "propertyPath": [ "_lpos" @@ -7015,7 +7070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 329 + "__id__": 333 }, "propertyPath": [ "_left" @@ -7031,7 +7086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 318 + "__id__": 322 }, "propertyPath": [ "_active" @@ -7041,7 +7096,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 325 + "__id__": 329 }, "propertyPath": [ "_bottom" @@ -7051,7 +7106,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 329 + "__id__": 333 }, "propertyPath": [ "_bottom" @@ -7061,7 +7116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 334 + "__id__": 338 }, "propertyPath": [ "_lpos" @@ -7082,7 +7137,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 336 + "__id__": 340 }, "propertyPath": [ "_lpos" @@ -7107,14 +7162,14 @@ "__id__": 45 }, "_prefab": { - "__id__": 338 + "__id__": 342 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 337 + "__id__": 341 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -7122,7 +7177,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 339 + "__id__": 343 }, "targetOverrides": null }, @@ -7135,24 +7190,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 340 - }, - { - "__id__": 342 - }, - { - "__id__": 343 - }, { "__id__": 344 }, { - "__id__": 345 + "__id__": 346 }, { "__id__": 347 }, + { + "__id__": 348 + }, { "__id__": 349 }, @@ -7162,17 +7211,23 @@ { "__id__": 353 }, - { - "__id__": 354 - }, { "__id__": 355 }, { - "__id__": 356 + "__id__": 357 }, { "__id__": 358 + }, + { + "__id__": 359 + }, + { + "__id__": 360 + }, + { + "__id__": 362 } ], "removedComponents": [] @@ -7180,7 +7235,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 341 + "__id__": 345 }, "propertyPath": [ "_name" @@ -7196,7 +7251,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 341 + "__id__": 345 }, "propertyPath": [ "_lpos" @@ -7211,7 +7266,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 341 + "__id__": 345 }, "propertyPath": [ "_lrot" @@ -7227,7 +7282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 341 + "__id__": 345 }, "propertyPath": [ "_euler" @@ -7242,7 +7297,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 346 + "__id__": 350 }, "propertyPath": [ "_lpos" @@ -7263,7 +7318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 348 + "__id__": 352 }, "propertyPath": [ "_left" @@ -7279,7 +7334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 350 + "__id__": 354 }, "propertyPath": [ "_lpos" @@ -7300,7 +7355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 356 }, "propertyPath": [ "_left" @@ -7316,7 +7371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 341 + "__id__": 345 }, "propertyPath": [ "_active" @@ -7326,7 +7381,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 352 + "__id__": 356 }, "propertyPath": [ "_bottom" @@ -7336,7 +7391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 348 + "__id__": 352 }, "propertyPath": [ "_bottom" @@ -7346,7 +7401,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 357 + "__id__": 361 }, "propertyPath": [ "_lpos" @@ -7367,7 +7422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 363 }, "propertyPath": [ "_lpos" @@ -7395,7 +7450,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -7423,7 +7478,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 367 }, "_alignFlags": 44, "_target": null, @@ -7459,7 +7514,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 365 + "__id__": 369 }, "_resizeMode": 1, "_layoutType": 1, @@ -7510,29 +7565,29 @@ }, "_children": [ { - "__id__": 368 + "__id__": 372 }, { - "__id__": 393 + "__id__": 397 }, { - "__id__": 435 + "__id__": 439 } ], "_active": true, "_components": [ - { - "__id__": 497 - }, - { - "__id__": 499 - }, { "__id__": 501 + }, + { + "__id__": 503 + }, + { + "__id__": 505 } ], "_prefab": { - "__id__": 503 + "__id__": 507 }, "_lpos": { "__type__": "cc.Vec3", @@ -7569,30 +7624,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 371 }, "_children": [ { - "__id__": 369 + "__id__": 373 }, { - "__id__": 377 + "__id__": 381 } ], "_active": true, "_components": [ { - "__id__": 385 + "__id__": 389 }, { - "__id__": 387 + "__id__": 391 }, { - "__id__": 390 + "__id__": 394 } ], "_prefab": { - "__id__": 392 + "__id__": 396 }, "_lpos": { "__type__": "cc.Vec3", @@ -7629,23 +7684,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 368 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 370 - }, - { - "__id__": 372 - }, { "__id__": 374 + }, + { + "__id__": 376 + }, + { + "__id__": 378 } ], "_prefab": { - "__id__": 376 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -7682,11 +7737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -7710,11 +7765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7755,11 +7810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 369 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 379 }, "_alignFlags": 45, "_target": null, @@ -7804,23 +7859,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 368 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 378 - }, - { - "__id__": 380 - }, { "__id__": 382 + }, + { + "__id__": 384 + }, + { + "__id__": 386 } ], "_prefab": { - "__id__": 384 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -7857,11 +7912,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -7885,11 +7940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 385 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7953,11 +8008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 377 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 387 }, "_alignFlags": 16, "_target": null, @@ -8002,11 +8057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -8030,15 +8085,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 392 }, "clickEvents": [ { - "__id__": 389 + "__id__": 393 } ], "_interactable": true, @@ -8078,7 +8133,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 368 + "__id__": 372 }, "_id": "" }, @@ -8102,11 +8157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 395 }, "_alignFlags": 33, "_target": null, @@ -8151,27 +8206,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 371 }, "_children": [ { - "__id__": 394 + "__id__": 398 }, { - "__id__": 402 + "__id__": 406 }, { - "__id__": 426 + "__id__": 430 } ], "_active": true, "_components": [ { - "__id__": 432 + "__id__": 436 } ], "_prefab": { - "__id__": 434 + "__id__": 438 }, "_lpos": { "__type__": "cc.Vec3", @@ -8208,23 +8263,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 393 + "__id__": 397 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 395 - }, - { - "__id__": 397 - }, { "__id__": 399 + }, + { + "__id__": 401 + }, + { + "__id__": 403 } ], "_prefab": { - "__id__": 401 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -8261,11 +8316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 400 }, "_contentSize": { "__type__": "cc.Size", @@ -8289,11 +8344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 402 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8337,11 +8392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 394 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 404 }, "_alignFlags": 45, "_target": null, @@ -8386,30 +8441,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 393 + "__id__": 397 }, "_children": [ { - "__id__": 403 + "__id__": 407 }, { - "__id__": 409 + "__id__": 413 }, { - "__id__": 415 + "__id__": 419 } ], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 425 }, { - "__id__": 423 + "__id__": 427 } ], "_prefab": { - "__id__": 425 + "__id__": 429 }, "_lpos": { "__type__": "cc.Vec3", @@ -8446,20 +8501,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 402 + "__id__": 406 }, "_children": [], "_active": false, "_components": [ { - "__id__": 404 + "__id__": 408 }, { - "__id__": 406 + "__id__": 410 } ], "_prefab": { - "__id__": 408 + "__id__": 412 }, "_lpos": { "__type__": "cc.Vec3", @@ -8496,11 +8551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 403 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 409 }, "_contentSize": { "__type__": "cc.Size", @@ -8524,11 +8579,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 403 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 411 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8582,20 +8637,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 402 + "__id__": 406 }, "_children": [], "_active": true, "_components": [ { - "__id__": 410 + "__id__": 414 }, { - "__id__": 412 + "__id__": 416 } ], "_prefab": { - "__id__": 414 + "__id__": 418 }, "_lpos": { "__type__": "cc.Vec3", @@ -8632,11 +8687,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -8660,11 +8715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8721,20 +8776,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 402 + "__id__": 406 }, "_children": [], "_active": true, "_components": [ { - "__id__": 416 + "__id__": 420 }, { - "__id__": 418 + "__id__": 422 } ], "_prefab": { - "__id__": 420 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -8771,11 +8826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 421 }, "_contentSize": { "__type__": "cc.Size", @@ -8799,11 +8854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 423 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8880,11 +8935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -8908,11 +8963,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 402 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 428 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8963,20 +9018,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 393 + "__id__": 397 }, "_children": [], "_active": true, "_components": [ { - "__id__": 427 + "__id__": 431 }, { - "__id__": 429 + "__id__": 433 } ], "_prefab": { - "__id__": 431 + "__id__": 435 }, "_lpos": { "__type__": "cc.Vec3", @@ -9013,11 +9068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 432 }, "_contentSize": { "__type__": "cc.Size", @@ -9041,11 +9096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 426 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 434 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9122,11 +9177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 393 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", @@ -9163,36 +9218,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 367 + "__id__": 371 }, "_children": [ { - "__id__": 436 + "__id__": 440 }, { - "__id__": 444 + "__id__": 448 }, { - "__id__": 452 + "__id__": 456 }, { - "__id__": 478 + "__id__": 482 }, { - "__id__": 486 + "__id__": 490 } ], "_active": true, "_components": [ { - "__id__": 492 + "__id__": 496 }, { - "__id__": 494 + "__id__": 498 } ], "_prefab": { - "__id__": 496 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -9229,23 +9284,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 439 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 437 - }, - { - "__id__": 439 - }, { "__id__": 441 + }, + { + "__id__": 443 + }, + { + "__id__": 445 } ], "_prefab": { - "__id__": 443 + "__id__": 447 }, "_lpos": { "__type__": "cc.Vec3", @@ -9282,11 +9337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 442 }, "_contentSize": { "__type__": "cc.Size", @@ -9310,11 +9365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 440 + "__id__": 444 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9358,11 +9413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 442 + "__id__": 446 }, "_alignFlags": 45, "_target": null, @@ -9407,23 +9462,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 439 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 445 - }, - { - "__id__": 447 - }, { "__id__": 449 + }, + { + "__id__": 451 + }, + { + "__id__": 453 } ], "_prefab": { - "__id__": 451 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", @@ -9460,11 +9515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 450 }, "_contentSize": { "__type__": "cc.Size", @@ -9488,11 +9543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 452 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9536,11 +9591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 450 + "__id__": 454 }, "_alignFlags": 45, "_target": null, @@ -9585,33 +9640,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 439 }, "_children": [ { - "__id__": 453 + "__id__": 457 }, { - "__id__": 459 + "__id__": 463 }, { - "__id__": 465 + "__id__": 469 } ], "_active": true, "_components": [ - { - "__id__": 471 - }, - { - "__id__": 473 - }, { "__id__": 475 + }, + { + "__id__": 477 + }, + { + "__id__": 479 } ], "_prefab": { - "__id__": 477 + "__id__": 481 }, "_lpos": { "__type__": "cc.Vec3", @@ -9648,20 +9703,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 452 + "__id__": 456 }, "_children": [], "_active": false, "_components": [ { - "__id__": 454 + "__id__": 458 }, { - "__id__": 456 + "__id__": 460 } ], "_prefab": { - "__id__": 458 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -9698,11 +9753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 459 }, "_contentSize": { "__type__": "cc.Size", @@ -9726,11 +9781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 461 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9784,20 +9839,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 452 + "__id__": 456 }, "_children": [], "_active": true, "_components": [ { - "__id__": 460 + "__id__": 464 }, { - "__id__": 462 + "__id__": 466 } ], "_prefab": { - "__id__": 464 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -9834,11 +9889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 465 }, "_contentSize": { "__type__": "cc.Size", @@ -9862,11 +9917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 467 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9923,20 +9978,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 452 + "__id__": 456 }, "_children": [], "_active": true, "_components": [ { - "__id__": 466 + "__id__": 470 }, { - "__id__": 468 + "__id__": 472 } ], "_prefab": { - "__id__": 470 + "__id__": 474 }, "_lpos": { "__type__": "cc.Vec3", @@ -9973,11 +10028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 465 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 471 }, "_contentSize": { "__type__": "cc.Size", @@ -10001,11 +10056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 465 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 473 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10082,11 +10137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 452 + "__id__": 456 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 476 }, "_contentSize": { "__type__": "cc.Size", @@ -10110,11 +10165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 452 + "__id__": 456 }, "_enabled": true, "__prefab": { - "__id__": 474 + "__id__": 478 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10152,11 +10207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 452 + "__id__": 456 }, "_enabled": true, "__prefab": { - "__id__": 476 + "__id__": 480 }, "_alignFlags": 16, "_target": null, @@ -10201,23 +10256,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 439 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 479 - }, - { - "__id__": 481 - }, { "__id__": 483 + }, + { + "__id__": 485 + }, + { + "__id__": 487 } ], "_prefab": { - "__id__": 485 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -10254,11 +10309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 484 }, "_contentSize": { "__type__": "cc.Size", @@ -10282,11 +10337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 486 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10350,11 +10405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 488 }, "_alignFlags": 16, "_target": null, @@ -10399,20 +10454,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 435 + "__id__": 439 }, "_children": [], "_active": false, "_components": [ { - "__id__": 487 + "__id__": 491 }, { - "__id__": 489 + "__id__": 493 } ], "_prefab": { - "__id__": 491 + "__id__": 495 }, "_lpos": { "__type__": "cc.Vec3", @@ -10449,11 +10504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 492 }, "_contentSize": { "__type__": "cc.Size", @@ -10477,11 +10532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 494 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10535,11 +10590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 497 }, "_contentSize": { "__type__": "cc.Size", @@ -10563,11 +10618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 495 + "__id__": 499 }, "_alignFlags": 12, "_target": null, @@ -10612,11 +10667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 502 }, "_contentSize": { "__type__": "cc.Size", @@ -10640,11 +10695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 504 }, "_resizeMode": 1, "_layoutType": 1, @@ -10678,11 +10733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 371 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 506 }, "_alignFlags": 44, "_target": null, @@ -10731,7 +10786,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 509 }, "_contentSize": { "__type__": "cc.Size", @@ -10759,7 +10814,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 511 }, "_alignFlags": 21, "_target": null, @@ -10795,7 +10850,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 513 }, "debugMode": false, "showMemoryPanel": true, @@ -10820,7 +10875,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 515 }, "_id": "" }, @@ -10838,7 +10893,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 517 }, "debugMode": false, "_id": "" @@ -10857,28 +10912,28 @@ }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 519 }, "card1": { - "__id__": 258 + "__id__": 262 }, "card2": { - "__id__": 291 + "__id__": 295 }, "card3": { - "__id__": 314 + "__id__": 318 }, "card4": { - "__id__": 337 + "__id__": 341 }, "cards_chou": { - "__id__": 393 + "__id__": 397 }, "cards_up": { - "__id__": 435 + "__id__": 439 }, "coins_node": { - "__id__": 186 + "__id__": 188 }, "pool_lv_node": { "__id__": 95 @@ -10909,7 +10964,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 517 + "__id__": 521 }, "_id": "" }, @@ -10940,29 +10995,29 @@ }, "_children": [ { - "__id__": 520 + "__id__": 524 }, { - "__id__": 536 + "__id__": 540 }, { - "__id__": 572 + "__id__": 576 } ], "_active": false, "_components": [ - { - "__id__": 648 - }, - { - "__id__": 650 - }, { "__id__": 652 + }, + { + "__id__": 654 + }, + { + "__id__": 656 } ], "_prefab": { - "__id__": 654 + "__id__": 658 }, "_lpos": { "__type__": "cc.Vec3", @@ -10999,27 +11054,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 519 + "__id__": 523 }, "_children": [ { - "__id__": 521 + "__id__": 525 } ], "_active": true, "_components": [ - { - "__id__": 529 - }, - { - "__id__": 531 - }, { "__id__": 533 + }, + { + "__id__": 535 + }, + { + "__id__": 537 } ], "_prefab": { - "__id__": 535 + "__id__": 539 }, "_lpos": { "__type__": "cc.Vec3", @@ -11056,23 +11111,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 520 + "__id__": 524 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 522 - }, - { - "__id__": 524 - }, { "__id__": 526 + }, + { + "__id__": 528 + }, + { + "__id__": 530 } ], "_prefab": { - "__id__": 528 + "__id__": 532 }, "_lpos": { "__type__": "cc.Vec3", @@ -11109,11 +11164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 521 + "__id__": 525 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 527 }, "_contentSize": { "__type__": "cc.Size", @@ -11137,11 +11192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 521 + "__id__": 525 }, "_enabled": true, "__prefab": { - "__id__": 525 + "__id__": 529 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11185,11 +11240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 521 + "__id__": 525 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 531 }, "_alignFlags": 45, "_target": null, @@ -11234,11 +11289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 520 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 534 }, "_contentSize": { "__type__": "cc.Size", @@ -11262,11 +11317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 520 + "__id__": 524 }, "_enabled": false, "__prefab": { - "__id__": 532 + "__id__": 536 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11304,11 +11359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 520 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 538 }, "_alignFlags": 45, "_target": null, @@ -11351,17 +11406,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 519 + "__id__": 523 }, "_prefab": { - "__id__": 537 + "__id__": 541 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 536 + "__id__": 540 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -11369,7 +11424,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 538 + "__id__": 542 }, "targetOverrides": null }, @@ -11382,12 +11437,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 539 - }, - { - "__id__": 541 - }, { "__id__": 543 }, @@ -11401,10 +11450,10 @@ "__id__": 549 }, { - "__id__": 552 + "__id__": 551 }, { - "__id__": 554 + "__id__": 553 }, { "__id__": 556 @@ -11429,6 +11478,12 @@ }, { "__id__": 570 + }, + { + "__id__": 572 + }, + { + "__id__": 574 } ], "removedComponents": [] @@ -11436,7 +11491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 544 }, "propertyPath": [ "_name" @@ -11452,7 +11507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 542 + "__id__": 546 }, "propertyPath": [ "_lpos" @@ -11473,7 +11528,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 544 + "__id__": 548 }, "propertyPath": [ "_lrot" @@ -11495,7 +11550,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 550 }, "propertyPath": [ "_euler" @@ -11516,7 +11571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 552 }, "propertyPath": [ "clickEvents", @@ -11533,14 +11588,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 550 + "__id__": 554 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 551 + "__id__": 555 } }, { @@ -11552,7 +11607,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 519 + "__id__": 523 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -11562,13 +11617,13 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 553 + "__id__": 557 }, "propertyPath": [ "_target" ], "value": { - "__id__": 536 + "__id__": 540 } }, { @@ -11580,7 +11635,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 559 }, "propertyPath": [ "_bottom" @@ -11596,7 +11651,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 561 }, "propertyPath": [ "_spriteFrame" @@ -11615,7 +11670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 559 + "__id__": 563 }, "propertyPath": [ "_contentSize" @@ -11635,7 +11690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 561 + "__id__": 565 }, "propertyPath": [ "_contentSize" @@ -11655,7 +11710,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 567 }, "propertyPath": [ "_lineHeight" @@ -11671,7 +11726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 569 }, "propertyPath": [ "_contentSize" @@ -11691,7 +11746,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 567 + "__id__": 571 }, "propertyPath": [ "_fontSize" @@ -11707,7 +11762,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 569 + "__id__": 573 }, "propertyPath": [ "_actualFontSize" @@ -11723,7 +11778,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 571 + "__id__": 575 }, "propertyPath": [ "_outlineWidth" @@ -11742,33 +11797,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 519 + "__id__": 523 }, "_children": [ { - "__id__": 573 + "__id__": 577 }, { - "__id__": 595 + "__id__": 599 }, { - "__id__": 619 + "__id__": 623 } ], "_active": true, "_components": [ - { - "__id__": 641 - }, - { - "__id__": 643 - }, { "__id__": 645 + }, + { + "__id__": 647 + }, + { + "__id__": 649 } ], "_prefab": { - "__id__": 647 + "__id__": 651 }, "_lpos": { "__type__": "cc.Vec3", @@ -11805,27 +11860,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 572 + "__id__": 576 }, "_children": [ { - "__id__": 574 + "__id__": 578 }, { - "__id__": 580 + "__id__": 584 }, { - "__id__": 586 + "__id__": 590 } ], "_active": true, "_components": [ { - "__id__": 592 + "__id__": 596 } ], "_prefab": { - "__id__": 594 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -11862,20 +11917,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 573 + "__id__": 577 }, "_children": [], "_active": true, "_components": [ { - "__id__": 575 + "__id__": 579 }, { - "__id__": 577 + "__id__": 581 } ], "_prefab": { - "__id__": 579 + "__id__": 583 }, "_lpos": { "__type__": "cc.Vec3", @@ -11912,11 +11967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 576 + "__id__": 580 }, "_contentSize": { "__type__": "cc.Size", @@ -11940,11 +11995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 578 }, "_enabled": true, "__prefab": { - "__id__": 578 + "__id__": 582 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11998,20 +12053,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 573 + "__id__": 577 }, "_children": [], "_active": false, "_components": [ { - "__id__": 581 + "__id__": 585 }, { - "__id__": 583 + "__id__": 587 } ], "_prefab": { - "__id__": 585 + "__id__": 589 }, "_lpos": { "__type__": "cc.Vec3", @@ -12048,11 +12103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 580 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 586 }, "_contentSize": { "__type__": "cc.Size", @@ -12076,11 +12131,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 580 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 588 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12134,20 +12189,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 573 + "__id__": 577 }, "_children": [], "_active": true, "_components": [ { - "__id__": 587 + "__id__": 591 }, { - "__id__": 589 + "__id__": 593 } ], "_prefab": { - "__id__": 591 + "__id__": 595 }, "_lpos": { "__type__": "cc.Vec3", @@ -12184,11 +12239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 588 + "__id__": 592 }, "_contentSize": { "__type__": "cc.Size", @@ -12212,11 +12267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 586 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 590 + "__id__": 594 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12270,11 +12325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 577 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 597 }, "_contentSize": { "__type__": "cc.Size", @@ -12311,30 +12366,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 572 + "__id__": 576 }, "_children": [ { - "__id__": 596 + "__id__": 600 }, { - "__id__": 602 + "__id__": 606 }, { - "__id__": 608 + "__id__": 612 } ], "_active": true, "_components": [ { - "__id__": 614 + "__id__": 618 }, { - "__id__": 616 + "__id__": 620 } ], "_prefab": { - "__id__": 618 + "__id__": 622 }, "_lpos": { "__type__": "cc.Vec3", @@ -12371,20 +12426,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 595 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 597 + "__id__": 601 }, { - "__id__": 599 + "__id__": 603 } ], "_prefab": { - "__id__": 601 + "__id__": 605 }, "_lpos": { "__type__": "cc.Vec3", @@ -12421,11 +12476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 596 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 602 }, "_contentSize": { "__type__": "cc.Size", @@ -12449,11 +12504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 596 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 604 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12507,20 +12562,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 595 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 603 + "__id__": 607 }, { - "__id__": 605 + "__id__": 609 } ], "_prefab": { - "__id__": 607 + "__id__": 611 }, "_lpos": { "__type__": "cc.Vec3", @@ -12557,11 +12612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 608 }, "_contentSize": { "__type__": "cc.Size", @@ -12585,11 +12640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 610 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12643,20 +12698,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 595 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 609 + "__id__": 613 }, { - "__id__": 611 + "__id__": 615 } ], "_prefab": { - "__id__": 613 + "__id__": 617 }, "_lpos": { "__type__": "cc.Vec3", @@ -12693,11 +12748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 612 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 614 }, "_contentSize": { "__type__": "cc.Size", @@ -12721,11 +12776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 612 }, "_enabled": true, "__prefab": { - "__id__": 612 + "__id__": 616 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12779,11 +12834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 599 }, "_enabled": true, "__prefab": { - "__id__": 615 + "__id__": 619 }, "_contentSize": { "__type__": "cc.Size", @@ -12807,11 +12862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 599 }, "_enabled": true, "__prefab": { - "__id__": 617 + "__id__": 621 }, "clickEvents": [], "_interactable": true, @@ -12876,27 +12931,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 572 + "__id__": 576 }, "_children": [ { - "__id__": 620 + "__id__": 624 }, { - "__id__": 626 + "__id__": 630 }, { - "__id__": 632 + "__id__": 636 } ], "_active": true, "_components": [ { - "__id__": 638 + "__id__": 642 } ], "_prefab": { - "__id__": 640 + "__id__": 644 }, "_lpos": { "__type__": "cc.Vec3", @@ -12933,20 +12988,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 619 + "__id__": 623 }, "_children": [], "_active": true, "_components": [ { - "__id__": 621 + "__id__": 625 }, { - "__id__": 623 + "__id__": 627 } ], "_prefab": { - "__id__": 625 + "__id__": 629 }, "_lpos": { "__type__": "cc.Vec3", @@ -12983,11 +13038,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 624 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 626 }, "_contentSize": { "__type__": "cc.Size", @@ -13011,11 +13066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 624 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 628 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13069,20 +13124,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 619 + "__id__": 623 }, "_children": [], "_active": false, "_components": [ { - "__id__": 627 + "__id__": 631 }, { - "__id__": 629 + "__id__": 633 } ], "_prefab": { - "__id__": 631 + "__id__": 635 }, "_lpos": { "__type__": "cc.Vec3", @@ -13119,11 +13174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 630 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 632 }, "_contentSize": { "__type__": "cc.Size", @@ -13147,11 +13202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 630 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 634 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13205,20 +13260,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 619 + "__id__": 623 }, "_children": [], "_active": true, "_components": [ { - "__id__": 633 + "__id__": 637 }, { - "__id__": 635 + "__id__": 639 } ], "_prefab": { - "__id__": 637 + "__id__": 641 }, "_lpos": { "__type__": "cc.Vec3", @@ -13255,11 +13310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 638 }, "_contentSize": { "__type__": "cc.Size", @@ -13283,11 +13338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 640 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13341,11 +13396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 619 + "__id__": 623 }, "_enabled": true, "__prefab": { - "__id__": 639 + "__id__": 643 }, "_contentSize": { "__type__": "cc.Size", @@ -13382,11 +13437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 572 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 646 }, "_contentSize": { "__type__": "cc.Size", @@ -13410,11 +13465,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 572 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 648 }, "_alignFlags": 44, "_target": null, @@ -13446,11 +13501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 572 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 650 }, "_resizeMode": 1, "_layoutType": 1, @@ -13497,11 +13552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 649 + "__id__": 653 }, "_contentSize": { "__type__": "cc.Size", @@ -13525,11 +13580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 651 + "__id__": 655 }, "_alignFlags": 21, "_target": null, @@ -13561,11 +13616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 653 + "__id__": 657 }, "_id": "" }, @@ -13593,14 +13648,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 656 + "__id__": 660 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 655 + "__id__": 659 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -13608,7 +13663,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 657 + "__id__": 661 }, "targetOverrides": null }, @@ -13621,20 +13676,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 658 - }, - { - "__id__": 660 - }, - { - "__id__": 661 - }, { "__id__": 662 }, { - "__id__": 663 + "__id__": 664 + }, + { + "__id__": 665 + }, + { + "__id__": 666 + }, + { + "__id__": 667 } ], "removedComponents": [] @@ -13642,7 +13697,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 663 }, "propertyPath": [ "_name" @@ -13658,7 +13713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 663 }, "propertyPath": [ "_lpos" @@ -13673,7 +13728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 663 }, "propertyPath": [ "_lrot" @@ -13689,7 +13744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 663 }, "propertyPath": [ "_euler" @@ -13704,7 +13759,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 663 }, "propertyPath": [ "_active" @@ -13721,23 +13776,23 @@ }, "_children": [ { - "__id__": 665 + "__id__": 669 } ], "_active": true, "_components": [ - { - "__id__": 703 - }, - { - "__id__": 705 - }, { "__id__": 707 + }, + { + "__id__": 709 + }, + { + "__id__": 711 } ], "_prefab": { - "__id__": 709 + "__id__": 713 }, "_lpos": { "__type__": "cc.Vec3", @@ -13774,30 +13829,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 664 + "__id__": 668 }, "_children": [ { - "__id__": 666 + "__id__": 670 } ], "_active": true, "_components": [ - { - "__id__": 694 - }, - { - "__id__": 696 - }, { "__id__": 698 }, { "__id__": 700 + }, + { + "__id__": 702 + }, + { + "__id__": 704 } ], "_prefab": { - "__id__": 702 + "__id__": 706 }, "_lpos": { "__type__": "cc.Vec3", @@ -13834,27 +13889,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 665 + "__id__": 669 }, "_children": [ { - "__id__": 667 + "__id__": 671 }, { - "__id__": 675 + "__id__": 679 }, { - "__id__": 681 + "__id__": 685 } ], "_active": true, "_components": [ { - "__id__": 691 + "__id__": 695 } ], "_prefab": { - "__id__": 693 + "__id__": 697 }, "_lpos": { "__type__": "cc.Vec3", @@ -13891,23 +13946,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 666 + "__id__": 670 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 668 - }, - { - "__id__": 670 - }, { "__id__": 672 + }, + { + "__id__": 674 + }, + { + "__id__": 676 } ], "_prefab": { - "__id__": 674 + "__id__": 678 }, "_lpos": { "__type__": "cc.Vec3", @@ -13944,11 +13999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 671 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 673 }, "_contentSize": { "__type__": "cc.Size", @@ -13972,11 +14027,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 671 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 675 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14020,11 +14075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 671 }, "_enabled": true, "__prefab": { - "__id__": 673 + "__id__": 677 }, "_alignFlags": 40, "_target": null, @@ -14069,20 +14124,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 666 + "__id__": 670 }, "_children": [], "_active": true, "_components": [ { - "__id__": 676 + "__id__": 680 }, { - "__id__": 678 + "__id__": 682 } ], "_prefab": { - "__id__": 680 + "__id__": 684 }, "_lpos": { "__type__": "cc.Vec3", @@ -14119,11 +14174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 679 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 681 }, "_contentSize": { "__type__": "cc.Size", @@ -14147,11 +14202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 679 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 683 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14208,26 +14263,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 666 + "__id__": 670 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 682 - }, - { - "__id__": 684 - }, { "__id__": 686 }, { "__id__": 688 + }, + { + "__id__": 690 + }, + { + "__id__": 692 } ], "_prefab": { - "__id__": 690 + "__id__": 694 }, "_lpos": { "__type__": "cc.Vec3", @@ -14264,11 +14319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 683 + "__id__": 687 }, "_contentSize": { "__type__": "cc.Size", @@ -14292,11 +14347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 685 + "__id__": 689 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14360,11 +14415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 687 + "__id__": 691 }, "_alignFlags": 10, "_target": null, @@ -14396,11 +14451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 693 }, "templateMode": true, "watchPath": "data.data.gold", @@ -14433,11 +14488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 670 }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 696 }, "_contentSize": { "__type__": "cc.Size", @@ -14474,11 +14529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 695 + "__id__": 699 }, "_contentSize": { "__type__": "cc.Size", @@ -14502,11 +14557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 697 + "__id__": 701 }, "_alignFlags": 8, "_target": null, @@ -14538,11 +14593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 699 + "__id__": 703 }, "_resizeMode": 0, "_layoutType": 1, @@ -14576,11 +14631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 705 }, "_alignFlags": 40, "_target": null, @@ -14625,11 +14680,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 704 + "__id__": 708 }, "_contentSize": { "__type__": "cc.Size", @@ -14653,11 +14708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 706 + "__id__": 710 }, "_alignFlags": 17, "_target": null, @@ -14689,11 +14744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 708 + "__id__": 712 }, "_id": "" }, @@ -14724,7 +14779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 711 + "__id__": 715 }, "_contentSize": { "__type__": "cc.Size", @@ -14752,7 +14807,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 717 }, "_alignFlags": 45, "_target": null, @@ -14788,7 +14843,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 715 + "__id__": 719 }, "debugMode": false, "_id": "" @@ -14810,22 +14865,22 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 655 + "__id__": 659 }, { - "__id__": 536 + "__id__": 540 }, { - "__id__": 337 + "__id__": 341 }, { - "__id__": 314 + "__id__": 318 }, { - "__id__": 291 + "__id__": 295 }, { - "__id__": 258 + "__id__": 262 }, { "__id__": 25 diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 71102d14..fdce20a8 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -62,6 +62,8 @@ export class SingletonModuleComp extends ecs.Comp { mission_data:{ mon_num:0,//怪物数量 hero_num:0,//英雄数量 + hero_max_num:5,//英雄可召唤上限 + hero_extend_max_num:6,//英雄可拓展上限 wave_time_num:0,//波次时间 in_fight:false, fight_time:0,//战斗时间 @@ -236,4 +238,4 @@ export class SingletonModuleComp extends ecs.Comp { } -export var smc: SingletonModuleComp = ecs.getSingleton(SingletonModuleComp); \ No newline at end of file +export var smc: SingletonModuleComp = ecs.getSingleton(SingletonModuleComp); diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 54708741..65cb7d85 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -150,8 +150,6 @@ export class Hero extends ecs.Entity { } }) .start(); - // 维护关卡内英雄数量统计 - smc.vmdata.mission_data.hero_num++ } /** 重置入口：复用 destroy 的释放流程 */ @@ -197,10 +195,6 @@ export class BattleEntityLifecycleSystem extends ecs.ComblockSystem if (heroAttrs) { mLogger.log(heroAttrs.debugMode, 'BattleEntityLifecycle', `${label}离开世界: ${heroAttrs.hero_name}`); if (heroAttrs.fac === FacSet.HERO) { - const missionData = smc.vmdata?.mission_data; - if (missionData) { - missionData.hero_num = Math.max(0, (missionData.hero_num ?? 0) - 1); - } oops.message.dispatchEvent(GameEvent.HeroDead, { eid: e.eid, model: heroAttrs diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index c13b973b..8ee7796b 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -8,6 +8,7 @@ import { CardComp } from "./CardComp"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; import { HInfoComp } from "./HInfoComp"; +import { smc } from "../common/SingletonModuleComp"; const { ccclass, property } = _decorator; @@ -50,14 +51,8 @@ export class MissionCardComp extends CCComp { private cardComps: CardComp[] = []; /** 当前卡池等级（仅影响抽卡来源，不直接改卡槽现有内容） */ private poolLv: number = CARD_POOL_INIT_LEVEL; - private coin: number = CardInitCoins; private readonly heroInfoItemGap: number = 86; private heroInfoSyncTimer: number = 0; - private readonly heroDefaultMaxCount: number = 5; - private readonly heroExtendMaxCount: number = 6; - private heroMaxCount: number = this.heroDefaultMaxCount; - private heroCurrentCount: number = 0; - private heroNumLabel: Label | null = null; private heroInfoItems: Map 0); } /** 解除按钮监听，避免节点销毁后回调泄漏 */ @@ -174,9 +173,10 @@ export class MissionCardComp extends CCComp { const eid = Number(payload?.eid ?? 0); const model = payload?.model as HeroAttrsComp | undefined; if (!eid || !model) return; - const before = this.heroCurrentCount; + const before = this.getAliveHeroCount(); this.ensureHeroInfoPanel(eid, model); - this.updateHeroNumUI(true, this.heroCurrentCount > before); + const after = this.getAliveHeroCount(); + this.updateHeroNumUI(true, after > before); } private onHeroDead() { @@ -188,11 +188,12 @@ export class MissionCardComp extends CCComp { const payload = args ?? event; if (!payload) return; const current = this.getAliveHeroCount(); - this.heroCurrentCount = current; - if (current >= this.heroMaxCount) { + this.syncMissionHeroData(current); + const heroMax = this.getMissionHeroMaxNum(); + if (current >= heroMax) { payload.cancel = true; payload.reason = "hero_limit"; - oops.gui.toast(`英雄已满 (${current}/${this.heroMaxCount})`); + oops.gui.toast(`英雄已满 (${current}/${heroMax})`); this.playHeroNumDeniedAnim(); } } @@ -246,7 +247,7 @@ export class MissionCardComp extends CCComp { return; } const cost = this.getUpgradeCost(this.poolLv); - const currentCoin = this.coin ?? 0; + const currentCoin = this.getMissionCoin(); if (currentCoin < cost) { oops.gui.toast(`金币不足，升级需要${cost}`); this.updatePoolLvUI(); @@ -257,14 +258,14 @@ export class MissionCardComp extends CCComp { }); return; } - this.coin = currentCoin - cost; + this.setMissionCoin(currentCoin - cost); this.poolLv += 1; - this.updateCoinUI(); + this.playCoinChangeAnim(false); this.updatePoolLvUI(); mLogger.log(this.debugMode, "MissionCardComp", "pool level up", { poolLv: this.poolLv, cost, - leftCoin: this.coin + leftCoin: this.getMissionCoin() }); } @@ -359,7 +360,7 @@ export class MissionCardComp extends CCComp { } private canUpPool() { if (this.poolLv >= CARD_POOL_MAX_LEVEL) return false; - const currentCoin = this.coin ?? 0; + const currentCoin = this.getMissionCoin(); return currentCoin >= this.getUpgradeCost(this.poolLv); } /** 更新升级按钮上的等级文案，反馈当前卡池层级 */ @@ -388,11 +389,17 @@ export class MissionCardComp extends CCComp { }); } - private updateCoinUI() { - if (!this.coins_node) return; - const label = this.coins_node.getChildByName("num")?.getComponent(Label); - if (!label) return; - label.string = `${this.coin ?? 0}`; + private playCoinChangeAnim(isIncrease: boolean) { + if (!this.coins_node || !this.coins_node.isValid) return; + const target = this.coins_node.getChildByName("num") || this.coins_node; + if (!target || !target.isValid) return; + const peak = isIncrease ? 1.16 : 1.08; + Tween.stopAllByTarget(target); + target.setScale(1, 1, 1); + tween(target) + .to(0.08, { scale: new Vec3(peak, peak, 1) }) + .to(0.1, { scale: new Vec3(1, 1, 1) }) + .start(); } private getUpgradeCost(lv: number): number { @@ -488,26 +495,32 @@ export class MissionCardComp extends CCComp { } } this.heroInfoSyncTimer = 0; - this.heroCurrentCount = 0; + this.syncMissionHeroData(0); this.updateHeroNumUI(false, false); } public setHeroMaxCount(max: number) { - const next = Math.max(this.heroDefaultMaxCount, Math.min(this.heroExtendMaxCount, Math.floor(max || this.heroDefaultMaxCount))); - if (next === this.heroMaxCount) return; - this.heroMaxCount = next; + const missionData = this.getMissionData(); + if (!missionData) return; + const min = 5; + const limit = Math.max(min, missionData.hero_extend_max_num ?? 6); + const next = Math.max(min, Math.min(limit, Math.floor(max || min))); + if (next === missionData.hero_max_num) return; + missionData.hero_max_num = next; this.updateHeroNumUI(true, false); } public tryExpandHeroMax(add: number = 1): boolean { - const next = this.heroMaxCount + Math.max(0, Math.floor(add)); - const before = this.heroMaxCount; + const missionData = this.getMissionData(); + if (!missionData) return false; + const before = this.getMissionHeroMaxNum(); + const next = before + Math.max(0, Math.floor(add)); this.setHeroMaxCount(next); - return this.heroMaxCount > before; + return this.getMissionHeroMaxNum() > before; } public canUseHeroCard(): boolean { - return this.getAliveHeroCount() < this.heroMaxCount; + return this.getAliveHeroCount() < this.getMissionHeroMaxNum(); } private getAliveHeroCount(): number { @@ -522,15 +535,7 @@ export class MissionCardComp extends CCComp { } private updateHeroNumUI(animate: boolean, isIncrease: boolean) { - this.heroCurrentCount = this.getAliveHeroCount(); - if (!this.hero_num_node || !this.hero_num_node.isValid) return; - const numNode = this.hero_num_node.getChildByName("num"); - if (!this.heroNumLabel) { - this.heroNumLabel = numNode?.getComponent(Label) || numNode?.getComponentInChildren(Label) || null; - } - if (this.heroNumLabel) { - this.heroNumLabel.string = `${this.heroCurrentCount}/${this.heroMaxCount}`; - } + this.syncMissionHeroData(); if (!animate || !isIncrease) return; this.playHeroNumGainAnim(); } @@ -561,6 +566,38 @@ export class MissionCardComp extends CCComp { .start(); } + private getMissionData(): any { + return smc?.vmdata?.mission_data ?? null; + } + + private getMissionHeroNum(): number { + const missionData = this.getMissionData(); + return Math.max(0, Math.floor(missionData?.hero_num ?? 0)); + } + + private getMissionCoin(): number { + const missionData = this.getMissionData(); + return Math.max(0, Math.floor(missionData?.coin ?? 0)); + } + + private setMissionCoin(value: number) { + const missionData = this.getMissionData(); + if (!missionData) return; + missionData.coin = Math.max(0, Math.floor(value)); + } + + private getMissionHeroMaxNum(): number { + const missionData = this.getMissionData(); + return Math.max(5, Math.floor(missionData?.hero_max_num ?? 5)); + } + + private syncMissionHeroData(count?: number) { + const missionData = this.getMissionData(); + if (!missionData) return; + const safeCount = Math.max(0, Math.floor(count ?? this.getAliveHeroCount())); + missionData.hero_num = safeCount; + } + /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { this.clearHeroInfoPanels();