From d715351fc021bde8d1e910430ffc7e7ae4a7306a Mon Sep 17 00:00:00 2001 From: TJH Date: Thu, 30 Apr 2026 10:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Game/Scripts/UpLayer.ts | 1 + .../history/prefabs/history_detail.prefab | 1393 +++++++++-------- assets/Game/history/scripts/HistoryDetail.ts | 26 +- assets/Main/Scripts/main/loading.ts | 2 +- 4 files changed, 796 insertions(+), 626 deletions(-) diff --git a/assets/Game/Scripts/UpLayer.ts b/assets/Game/Scripts/UpLayer.ts index 394f123..2f8f1b6 100644 --- a/assets/Game/Scripts/UpLayer.ts +++ b/assets/Game/Scripts/UpLayer.ts @@ -173,6 +173,7 @@ export class UpLayer extends Component { playScatterWaitSpine(bol: boolean) { + console.log('播放scatter等待动画2', this.scatterLayer); this.scatterLayer.children.forEach(child => child.getComponent(Icon).playScatterWaitSpine(bol)); } } diff --git a/assets/Game/history/prefabs/history_detail.prefab b/assets/Game/history/prefabs/history_detail.prefab index 261cd54..439f029 100644 --- a/assets/Game/history/prefabs/history_detail.prefab +++ b/assets/Game/history/prefabs/history_detail.prefab @@ -40,32 +40,32 @@ "__id__": 179 }, { - "__id__": 523 + "__id__": 529 }, { - "__id__": 561 + "__id__": 567 }, { - "__id__": 566 + "__id__": 572 }, { - "__id__": 589 + "__id__": 595 }, { - "__id__": 640 + "__id__": 646 } ], "_active": true, "_components": [ { - "__id__": 646 + "__id__": 652 }, { - "__id__": 648 + "__id__": 654 } ], "_prefab": { - "__id__": 650 + "__id__": 656 }, "_lpos": { "__type__": "cc.Vec3", @@ -4420,7 +4420,7 @@ "__id__": 180 }, { - "__id__": 446 + "__id__": 452 }, { "__id__": 198 @@ -4429,17 +4429,17 @@ "_active": true, "_components": [ { - "__id__": 518 + "__id__": 524 }, { - "__id__": 520 + "__id__": 526 }, { "__id__": 195 } ], "_prefab": { - "__id__": 522 + "__id__": 528 }, "_lpos": { "__type__": "cc.Vec3", @@ -4499,7 +4499,7 @@ } ], "_prefab": { - "__id__": 445 + "__id__": 451 }, "_lpos": { "__type__": "cc.Vec3", @@ -4848,38 +4848,38 @@ "__id__": 242 }, { - "__id__": 342 + "__id__": 348 }, { - "__id__": 354 + "__id__": 360 }, { - "__id__": 366 + "__id__": 372 }, { - "__id__": 378 + "__id__": 384 }, { - "__id__": 388 + "__id__": 394 }, { - "__id__": 410 + "__id__": 416 }, { - "__id__": 434 + "__id__": 440 } ], "_active": true, "_components": [ { - "__id__": 440 + "__id__": 446 }, { - "__id__": 442 + "__id__": 448 } ], "_prefab": { - "__id__": 444 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", @@ -4982,7 +4982,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 16260 + "height": 1626 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5996,16 +5996,19 @@ }, { "__id__": 333 + }, + { + "__id__": 339 } ], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 345 } ], "_prefab": { - "__id__": 341 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -8211,6 +8214,168 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "totalMulti", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 242 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 340 + }, + { + "__id__": 342 + } + ], + "_prefab": { + "__id__": 344 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -24.673, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 339 + }, + "_enabled": true, + "__prefab": { + "__id__": 341 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 186.08, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8dyUE+vPBOAbgL/izXGbY8" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 339 + }, + "_enabled": true, + "__prefab": { + "__id__": 343 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x12", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 100, + "_fontSize": 100, + "_fontFamily": "Arial", + "_lineHeight": 100, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "98ea3381-1ada-4e96-b703-43fb7f59a5e0", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "caLmOcD8pMqYDYNWGMTz1f" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bdtZZYMS5Pc6Ia8TF8Kmay", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -8221,7 +8386,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 346 }, "_contentSize": { "__type__": "cc.Size", @@ -8262,17 +8427,17 @@ }, "_children": [ { - "__id__": 343 + "__id__": 349 } ], "_active": true, "_components": [ { - "__id__": 351 + "__id__": 357 } ], "_prefab": { - "__id__": 353 + "__id__": 359 }, "_lpos": { "__type__": "cc.Vec3", @@ -8309,23 +8474,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 342 + "__id__": 348 }, "_children": [], "_active": true, "_components": [ { - "__id__": 344 + "__id__": 350 }, { - "__id__": 346 + "__id__": 352 }, { - "__id__": 348 + "__id__": 354 } ], "_prefab": { - "__id__": 350 + "__id__": 356 }, "_lpos": { "__type__": "cc.Vec3", @@ -8362,11 +8527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 351 }, "_contentSize": { "__type__": "cc.Size", @@ -8390,11 +8555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 353 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8458,11 +8623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 349 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 355 }, "key": "Payout", "maxWidth": 800, @@ -8491,11 +8656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 358 }, "_contentSize": { "__type__": "cc.Size", @@ -8536,17 +8701,17 @@ }, "_children": [ { - "__id__": 355 + "__id__": 361 } ], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 369 } ], "_prefab": { - "__id__": 365 + "__id__": 371 }, "_lpos": { "__type__": "cc.Vec3", @@ -8583,23 +8748,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 354 + "__id__": 360 }, "_children": [], "_active": true, "_components": [ { - "__id__": 356 + "__id__": 362 }, { - "__id__": 358 + "__id__": 364 }, { - "__id__": 360 + "__id__": 366 } ], "_prefab": { - "__id__": 362 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -8636,11 +8801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", @@ -8664,11 +8829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 365 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8732,11 +8897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 361 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 367 }, "key": "No Winning Combination", "maxWidth": 800, @@ -8765,11 +8930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -8810,17 +8975,17 @@ }, "_children": [ { - "__id__": 367 + "__id__": 373 } ], "_active": true, "_components": [ { - "__id__": 375 + "__id__": 381 } ], "_prefab": { - "__id__": 377 + "__id__": 383 }, "_lpos": { "__type__": "cc.Vec3", @@ -8857,23 +9022,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 366 + "__id__": 372 }, "_children": [], "_active": true, "_components": [ { - "__id__": 368 + "__id__": 374 }, { - "__id__": 370 + "__id__": 376 }, { - "__id__": 372 + "__id__": 378 } ], "_prefab": { - "__id__": 374 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -8910,11 +9075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -8938,11 +9103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 377 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9006,11 +9171,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 367 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 379 }, "key": "Feature Buy", "maxWidth": 800, @@ -9039,11 +9204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 366 + "__id__": 372 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 382 }, "_contentSize": { "__type__": "cc.Size", @@ -9084,17 +9249,17 @@ }, "_children": [ { - "__id__": 379 + "__id__": 385 } ], "_active": true, "_components": [ { - "__id__": 385 + "__id__": 391 } ], "_prefab": { - "__id__": 387 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", @@ -9131,20 +9296,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 378 + "__id__": 384 }, "_children": [], "_active": true, "_components": [ { - "__id__": 380 + "__id__": 386 }, { - "__id__": 382 + "__id__": 388 } ], "_prefab": { - "__id__": 384 + "__id__": 390 }, "_lpos": { "__type__": "cc.Vec3", @@ -9181,11 +9346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 385 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 387 }, "_contentSize": { "__type__": "cc.Size", @@ -9209,11 +9374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 385 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 389 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9290,11 +9455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 378 + "__id__": 384 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 392 }, "_contentSize": { "__type__": "cc.Size", @@ -9334,24 +9499,24 @@ "__id__": 197 }, "_children": [ - { - "__id__": 389 - }, { "__id__": 395 }, { "__id__": 401 + }, + { + "__id__": 407 } ], "_active": true, "_components": [ { - "__id__": 407 + "__id__": 413 } ], "_prefab": { - "__id__": 409 + "__id__": 415 }, "_lpos": { "__type__": "cc.Vec3", @@ -9388,20 +9553,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 394 }, "_children": [], "_active": true, "_components": [ { - "__id__": 390 + "__id__": 396 }, { - "__id__": 392 + "__id__": 398 } ], "_prefab": { - "__id__": 394 + "__id__": 400 }, "_lpos": { "__type__": "cc.Vec3", @@ -9438,11 +9603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 397 }, "_contentSize": { "__type__": "cc.Size", @@ -9466,11 +9631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 399 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9547,20 +9712,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 394 }, "_children": [], "_active": true, "_components": [ { - "__id__": 396 + "__id__": 402 }, { - "__id__": 398 + "__id__": 404 } ], "_prefab": { - "__id__": 400 + "__id__": 406 }, "_lpos": { "__type__": "cc.Vec3", @@ -9597,11 +9762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 403 }, "_contentSize": { "__type__": "cc.Size", @@ -9625,11 +9790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 405 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9706,20 +9871,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 394 }, "_children": [], "_active": true, "_components": [ { - "__id__": 402 + "__id__": 408 }, { - "__id__": 404 + "__id__": 410 } ], "_prefab": { - "__id__": 406 + "__id__": 412 }, "_lpos": { "__type__": "cc.Vec3", @@ -9756,11 +9921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 409 }, "_contentSize": { "__type__": "cc.Size", @@ -9784,11 +9949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 401 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 411 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9865,11 +10030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 408 + "__id__": 414 }, "_contentSize": { "__type__": "cc.Size", @@ -9909,27 +10074,27 @@ "__id__": 197 }, "_children": [ - { - "__id__": 411 - }, { "__id__": 417 }, { "__id__": 423 + }, + { + "__id__": 429 } ], "_active": true, "_components": [ { - "__id__": 429 + "__id__": 435 }, { - "__id__": 431 + "__id__": 437 } ], "_prefab": { - "__id__": 433 + "__id__": 439 }, "_lpos": { "__type__": "cc.Vec3", @@ -9966,20 +10131,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 410 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 412 + "__id__": 418 }, { - "__id__": 414 + "__id__": 420 } ], "_prefab": { - "__id__": 416 + "__id__": 422 }, "_lpos": { "__type__": "cc.Vec3", @@ -10016,11 +10181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 411 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 419 }, "_contentSize": { "__type__": "cc.Size", @@ -10044,11 +10209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 411 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 421 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10105,20 +10270,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 410 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 418 + "__id__": 424 }, { - "__id__": 420 + "__id__": 426 } ], "_prefab": { - "__id__": 422 + "__id__": 428 }, "_lpos": { "__type__": "cc.Vec3", @@ -10155,11 +10320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 425 }, "_contentSize": { "__type__": "cc.Size", @@ -10183,11 +10348,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 427 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10264,20 +10429,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 410 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 424 + "__id__": 430 }, { - "__id__": 426 + "__id__": 432 } ], "_prefab": { - "__id__": 428 + "__id__": 434 }, "_lpos": { "__type__": "cc.Vec3", @@ -10314,11 +10479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 431 }, "_contentSize": { "__type__": "cc.Size", @@ -10342,11 +10507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 433 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10423,11 +10588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 436 }, "_contentSize": { "__type__": "cc.Size", @@ -10451,11 +10616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 410 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 438 }, "clickEvents": [], "_interactable": true, @@ -10526,14 +10691,14 @@ "_active": true, "_components": [ { - "__id__": 435 + "__id__": 441 }, { - "__id__": 437 + "__id__": 443 } ], "_prefab": { - "__id__": 439 + "__id__": 445 }, "_lpos": { "__type__": "cc.Vec3", @@ -10570,11 +10735,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 442 }, "_contentSize": { "__type__": "cc.Size", @@ -10598,11 +10763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 440 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 444 }, "_resizeMode": 1, "_layoutType": 2, @@ -10653,7 +10818,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -10681,7 +10846,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 449 }, "_resizeMode": 1, "_layoutType": 2, @@ -10744,9 +10909,6 @@ "__id__": 179 }, "_children": [ - { - "__id__": 447 - }, { "__id__": 453 }, @@ -10754,35 +10916,38 @@ "__id__": 459 }, { - "__id__": 467 + "__id__": 465 }, { "__id__": 473 }, { - "__id__": 481 + "__id__": 479 }, { "__id__": 487 }, { - "__id__": 495 + "__id__": 493 }, { "__id__": 501 }, { "__id__": 507 + }, + { + "__id__": 513 } ], "_active": true, "_components": [ { - "__id__": 515 + "__id__": 521 } ], "_prefab": { - "__id__": 517 + "__id__": 523 }, "_lpos": { "__type__": "cc.Vec3", @@ -10819,20 +10984,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 448 + "__id__": 454 }, { - "__id__": 450 + "__id__": 456 } ], "_prefab": { - "__id__": 452 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -10869,11 +11034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 455 }, "_contentSize": { "__type__": "cc.Size", @@ -10897,11 +11062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 457 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10955,20 +11120,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 454 + "__id__": 460 }, { - "__id__": 456 + "__id__": 462 } ], "_prefab": { - "__id__": 458 + "__id__": 464 }, "_lpos": { "__type__": "cc.Vec3", @@ -11005,11 +11170,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 461 }, "_contentSize": { "__type__": "cc.Size", @@ -11033,11 +11198,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 463 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11114,23 +11279,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 460 + "__id__": 466 }, { - "__id__": 462 + "__id__": 468 }, { - "__id__": 464 + "__id__": 470 } ], "_prefab": { - "__id__": 466 + "__id__": 472 }, "_lpos": { "__type__": "cc.Vec3", @@ -11167,11 +11332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 467 }, "_contentSize": { "__type__": "cc.Size", @@ -11195,11 +11360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 469 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11263,11 +11428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 471 }, "key": "Transaction", "maxWidth": 800, @@ -11296,20 +11461,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 468 + "__id__": 474 }, { - "__id__": 470 + "__id__": 476 } ], "_prefab": { - "__id__": 472 + "__id__": 478 }, "_lpos": { "__type__": "cc.Vec3", @@ -11346,11 +11511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 473 }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 475 }, "_contentSize": { "__type__": "cc.Size", @@ -11374,11 +11539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 473 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 477 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11455,23 +11620,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 474 + "__id__": 480 }, { - "__id__": 476 + "__id__": 482 }, { - "__id__": 478 + "__id__": 484 } ], "_prefab": { - "__id__": 480 + "__id__": 486 }, "_lpos": { "__type__": "cc.Vec3", @@ -11508,11 +11673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 479 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 481 }, "_contentSize": { "__type__": "cc.Size", @@ -11536,11 +11701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 479 }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 483 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11604,11 +11769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 479 }, "_enabled": true, "__prefab": { - "__id__": 479 + "__id__": 485 }, "key": "Bet", "maxWidth": 800, @@ -11637,20 +11802,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 482 + "__id__": 488 }, { - "__id__": 484 + "__id__": 490 } ], "_prefab": { - "__id__": 486 + "__id__": 492 }, "_lpos": { "__type__": "cc.Vec3", @@ -11687,11 +11852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 481 + "__id__": 487 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 489 }, "_contentSize": { "__type__": "cc.Size", @@ -11715,11 +11880,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 481 + "__id__": 487 }, "_enabled": true, "__prefab": { - "__id__": 485 + "__id__": 491 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11796,23 +11961,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 488 + "__id__": 494 }, { - "__id__": 490 + "__id__": 496 }, { - "__id__": 492 + "__id__": 498 } ], "_prefab": { - "__id__": 494 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -11849,11 +12014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 489 + "__id__": 495 }, "_contentSize": { "__type__": "cc.Size", @@ -11877,11 +12042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 491 + "__id__": 497 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11945,11 +12110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 499 }, "key": "Profit", "maxWidth": 800, @@ -11978,20 +12143,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 496 + "__id__": 502 }, { - "__id__": 498 + "__id__": 504 } ], "_prefab": { - "__id__": 500 + "__id__": 506 }, "_lpos": { "__type__": "cc.Vec3", @@ -12028,11 +12193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 495 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 497 + "__id__": 503 }, "_contentSize": { "__type__": "cc.Size", @@ -12056,11 +12221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 495 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 499 + "__id__": 505 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12137,20 +12302,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 502 + "__id__": 508 }, { - "__id__": 504 + "__id__": 510 } ], "_prefab": { - "__id__": 506 + "__id__": 512 }, "_lpos": { "__type__": "cc.Vec3", @@ -12187,11 +12352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 501 + "__id__": 507 }, "_enabled": true, "__prefab": { - "__id__": 503 + "__id__": 509 }, "_contentSize": { "__type__": "cc.Size", @@ -12215,11 +12380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 501 + "__id__": 507 }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 511 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12296,23 +12461,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 452 }, "_children": [], "_active": true, "_components": [ { - "__id__": 508 + "__id__": 514 }, { - "__id__": 510 + "__id__": 516 }, { - "__id__": 512 + "__id__": 518 } ], "_prefab": { - "__id__": 514 + "__id__": 520 }, "_lpos": { "__type__": "cc.Vec3", @@ -12349,11 +12514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 515 }, "_contentSize": { "__type__": "cc.Size", @@ -12377,11 +12542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 517 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12445,11 +12610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 513 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 519 }, "key": "Balance", "maxWidth": 800, @@ -12478,11 +12643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 446 + "__id__": 452 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 522 }, "_contentSize": { "__type__": "cc.Size", @@ -12523,7 +12688,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 519 + "__id__": 525 }, "_contentSize": { "__type__": "cc.Size", @@ -12551,7 +12716,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 527 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12609,26 +12774,26 @@ }, "_children": [ { - "__id__": 524 + "__id__": 530 }, { - "__id__": 542 + "__id__": 548 } ], "_active": true, "_components": [ { - "__id__": 556 + "__id__": 562 }, { - "__id__": 558 + "__id__": 564 }, { - "__id__": 539 + "__id__": 545 } ], "_prefab": { - "__id__": 560 + "__id__": 566 }, "_lpos": { "__type__": "cc.Vec3", @@ -12665,30 +12830,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 529 }, "_children": [ { - "__id__": 525 + "__id__": 531 } ], "_active": false, "_components": [ - { - "__id__": 531 - }, - { - "__id__": 533 - }, - { - "__id__": 535 - }, { "__id__": 537 + }, + { + "__id__": 539 + }, + { + "__id__": 541 + }, + { + "__id__": 543 } ], "_prefab": { - "__id__": 555 + "__id__": 561 }, "_lpos": { "__type__": "cc.Vec3", @@ -12725,20 +12890,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 524 + "__id__": 530 }, "_children": [], "_active": true, "_components": [ { - "__id__": 526 + "__id__": 532 }, { - "__id__": 528 + "__id__": 534 } ], "_prefab": { - "__id__": 530 + "__id__": 536 }, "_lpos": { "__type__": "cc.Vec3", @@ -12775,11 +12940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 533 }, "_contentSize": { "__type__": "cc.Size", @@ -12803,11 +12968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 529 + "__id__": 535 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12861,11 +13026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -12889,11 +13054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 540 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12934,11 +13099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 542 }, "_alignFlags": 37, "_target": null, @@ -12970,17 +13135,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 544 }, "_scrollView": { - "__id__": 539 + "__id__": 545 }, "_handle": { - "__id__": 528 + "__id__": 534 }, "_direction": 1, "_enableAutoHide": false, @@ -12997,11 +13162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 546 }, "bounceDuration": 0.23, "brake": 0.75, @@ -13012,11 +13177,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 541 + "__id__": 547 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 537 + "__id__": 543 }, "_id": "" }, @@ -13030,20 +13195,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 542 + "__id__": 548 }, "_children": [], "_active": true, "_components": [ { - "__id__": 550 + "__id__": 556 }, { - "__id__": 552 + "__id__": 558 } ], "_prefab": { - "__id__": 554 + "__id__": 560 }, "_lpos": { "__type__": "cc.Vec3", @@ -13080,27 +13245,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 529 }, "_children": [ { - "__id__": 541 + "__id__": 547 } ], "_active": true, "_components": [ { - "__id__": 543 + "__id__": 549 }, { - "__id__": 545 + "__id__": 551 }, { - "__id__": 547 + "__id__": 553 } ], "_prefab": { - "__id__": 549 + "__id__": 555 }, "_lpos": { "__type__": "cc.Vec3", @@ -13137,11 +13302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 550 }, "_contentSize": { "__type__": "cc.Size", @@ -13165,11 +13330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 546 + "__id__": 552 }, "_type": 0, "_inverted": false, @@ -13187,11 +13352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 548 + "__id__": 554 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13246,11 +13411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 557 }, "_contentSize": { "__type__": "cc.Size", @@ -13274,11 +13439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 541 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 559 }, "_resizeMode": 1, "_layoutType": 1, @@ -13338,11 +13503,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 563 }, "_contentSize": { "__type__": "cc.Size", @@ -13366,11 +13531,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 565 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13430,14 +13595,14 @@ "_active": true, "_components": [ { - "__id__": 562 + "__id__": 568 }, { - "__id__": 564 + "__id__": 570 } ], "_prefab": { - "__id__": 588 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", @@ -13468,168 +13633,6 @@ }, "_id": "" }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 561 - }, - "_enabled": true, - "__prefab": { - "__id__": 563 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 1300 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "29cSi0hRtKT5KcF77YqHH8" - }, - { - "__type__": "44b78Au9wBAd5sX6xMbDj84", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 561 - }, - "_enabled": true, - "__prefab": { - "__id__": 565 - }, - "hor_scrollView": { - "__id__": 539 - }, - "item_detail": { - "__id__": 523 - }, - "flip": { - "__id__": 566 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "591p8DkY5Fe636/mgza7GL" - }, - { - "__type__": "cc.Node", - "_name": "flip", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 567 - }, - { - "__id__": 576 - } - ], - "_active": true, - "_components": [ - { - "__id__": 585 - } - ], - "_prefab": { - "__id__": 587 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -94.812, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "btn_page_left", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 566 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 568 - }, - { - "__id__": 570 - }, - { - "__id__": 572 - } - ], - "_prefab": { - "__id__": 575 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -400, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, { "__type__": "cc.UITransform", "_name": "", @@ -13642,6 +13645,168 @@ "__prefab": { "__id__": 569 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29cSi0hRtKT5KcF77YqHH8" + }, + { + "__type__": "44b78Au9wBAd5sX6xMbDj84", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 567 + }, + "_enabled": true, + "__prefab": { + "__id__": 571 + }, + "hor_scrollView": { + "__id__": 545 + }, + "item_detail": { + "__id__": 529 + }, + "flip": { + "__id__": 572 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "591p8DkY5Fe636/mgza7GL" + }, + { + "__type__": "cc.Node", + "_name": "flip", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 573 + }, + { + "__id__": 582 + } + ], + "_active": true, + "_components": [ + { + "__id__": 591 + } + ], + "_prefab": { + "__id__": 593 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -94.812, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "btn_page_left", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 572 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 574 + }, + { + "__id__": 576 + }, + { + "__id__": 578 + } + ], + "_prefab": { + "__id__": 581 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -400, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 573 + }, + "_enabled": true, + "__prefab": { + "__id__": 575 + }, "_contentSize": { "__type__": "cc.Size", "width": 117, @@ -13664,11 +13829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 567 + "__id__": 573 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 577 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13709,15 +13874,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 567 + "__id__": 573 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 579 }, "clickEvents": [ { - "__id__": 574 + "__id__": 580 } ], "_interactable": true, @@ -13769,7 +13934,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 567 + "__id__": 573 }, "_id": "" }, @@ -13806,23 +13971,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 566 + "__id__": 572 }, "_children": [], "_active": true, "_components": [ { - "__id__": 577 + "__id__": 583 }, { - "__id__": 579 + "__id__": 585 }, { - "__id__": 581 + "__id__": 587 } ], "_prefab": { - "__id__": 584 + "__id__": 590 }, "_lpos": { "__type__": "cc.Vec3", @@ -13859,11 +14024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 578 + "__id__": 584 }, "_contentSize": { "__type__": "cc.Size", @@ -13887,11 +14052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 580 + "__id__": 586 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13932,15 +14097,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 588 }, "clickEvents": [ { - "__id__": 583 + "__id__": 589 } ], "_interactable": true, @@ -13992,7 +14157,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 576 + "__id__": 582 }, "_id": "" }, @@ -14029,11 +14194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 566 + "__id__": 572 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 592 }, "_contentSize": { "__type__": "cc.Size", @@ -14087,29 +14252,29 @@ }, "_children": [ { - "__id__": 590 + "__id__": 596 }, { - "__id__": 608 + "__id__": 614 }, { - "__id__": 622 + "__id__": 628 } ], "_active": true, "_components": [ { - "__id__": 635 + "__id__": 641 }, { - "__id__": 637 + "__id__": 643 }, { - "__id__": 605 + "__id__": 611 } ], "_prefab": { - "__id__": 639 + "__id__": 645 }, "_lpos": { "__type__": "cc.Vec3", @@ -14146,30 +14311,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 589 + "__id__": 595 }, "_children": [ { - "__id__": 591 + "__id__": 597 } ], "_active": false, "_components": [ - { - "__id__": 597 - }, - { - "__id__": 599 - }, - { - "__id__": 601 - }, { "__id__": 603 + }, + { + "__id__": 605 + }, + { + "__id__": 607 + }, + { + "__id__": 609 } ], "_prefab": { - "__id__": 621 + "__id__": 627 }, "_lpos": { "__type__": "cc.Vec3", @@ -14206,20 +14371,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 590 + "__id__": 596 }, "_children": [], "_active": true, "_components": [ { - "__id__": 592 + "__id__": 598 }, { - "__id__": 594 + "__id__": 600 } ], "_prefab": { - "__id__": 596 + "__id__": 602 }, "_lpos": { "__type__": "cc.Vec3", @@ -14256,11 +14421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 599 }, "_contentSize": { "__type__": "cc.Size", @@ -14284,11 +14449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 597 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 601 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14342,11 +14507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 590 + "__id__": 596 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 604 }, "_contentSize": { "__type__": "cc.Size", @@ -14370,11 +14535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 590 + "__id__": 596 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 606 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14415,11 +14580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 590 + "__id__": 596 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 608 }, "_alignFlags": 37, "_target": null, @@ -14451,17 +14616,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 590 + "__id__": 596 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 610 }, "_scrollView": { - "__id__": 605 + "__id__": 611 }, "_handle": { - "__id__": 594 + "__id__": 600 }, "_direction": 1, "_enableAutoHide": false, @@ -14478,11 +14643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 589 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 612 }, "bounceDuration": 0.23, "brake": 0.75, @@ -14493,11 +14658,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 607 + "__id__": 613 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 603 + "__id__": 609 }, "_id": "" }, @@ -14511,20 +14676,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 608 + "__id__": 614 }, "_children": [], "_active": true, "_components": [ { - "__id__": 616 + "__id__": 622 }, { - "__id__": 618 + "__id__": 624 } ], "_prefab": { - "__id__": 620 + "__id__": 626 }, "_lpos": { "__type__": "cc.Vec3", @@ -14561,27 +14726,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 589 + "__id__": 595 }, "_children": [ { - "__id__": 607 + "__id__": 613 } ], "_active": true, "_components": [ { - "__id__": 609 + "__id__": 615 }, { - "__id__": 611 + "__id__": 617 }, { - "__id__": 613 + "__id__": 619 } ], "_prefab": { - "__id__": 615 + "__id__": 621 }, "_lpos": { "__type__": "cc.Vec3", @@ -14618,11 +14783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 614 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 616 }, "_contentSize": { "__type__": "cc.Size", @@ -14646,11 +14811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 614 }, "_enabled": true, "__prefab": { - "__id__": 612 + "__id__": 618 }, "_type": 0, "_inverted": false, @@ -14668,11 +14833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 614 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 620 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14727,11 +14892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 607 + "__id__": 613 }, "_enabled": true, "__prefab": { - "__id__": 617 + "__id__": 623 }, "_contentSize": { "__type__": "cc.Size", @@ -14755,11 +14920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 607 + "__id__": 613 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 625 }, "_resizeMode": 1, "_layoutType": 2, @@ -14819,24 +14984,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 589 + "__id__": 595 }, "_children": [ { - "__id__": 623 + "__id__": 629 } ], "_active": true, "_components": [ { - "__id__": 629 + "__id__": 635 }, { - "__id__": 631 + "__id__": 637 } ], "_prefab": { - "__id__": 634 + "__id__": 640 }, "_lpos": { "__type__": "cc.Vec3", @@ -14873,20 +15038,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 622 + "__id__": 628 }, "_children": [], "_active": true, "_components": [ { - "__id__": 624 + "__id__": 630 }, { - "__id__": 626 + "__id__": 632 } ], "_prefab": { - "__id__": 628 + "__id__": 634 }, "_lpos": { "__type__": "cc.Vec3", @@ -14923,11 +15088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 623 + "__id__": 629 }, "_enabled": true, "__prefab": { - "__id__": 625 + "__id__": 631 }, "_contentSize": { "__type__": "cc.Size", @@ -14951,11 +15116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 623 + "__id__": 629 }, "_enabled": true, "__prefab": { - "__id__": 627 + "__id__": 633 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15032,11 +15197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -15060,15 +15225,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 632 + "__id__": 638 }, "clickEvents": [ { - "__id__": 633 + "__id__": 639 } ], "_interactable": true, @@ -15120,7 +15285,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 622 + "__id__": 628 }, "_id": "" }, @@ -15157,11 +15322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 589 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 642 }, "_contentSize": { "__type__": "cc.Size", @@ -15185,11 +15350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 589 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 644 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15249,14 +15414,14 @@ "_active": false, "_components": [ { - "__id__": 641 + "__id__": 647 }, { - "__id__": 643 + "__id__": 649 } ], "_prefab": { - "__id__": 645 + "__id__": 651 }, "_lpos": { "__type__": "cc.Vec3", @@ -15293,11 +15458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 646 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 648 }, "_contentSize": { "__type__": "cc.Size", @@ -15321,11 +15486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 646 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 650 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15383,7 +15548,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 647 + "__id__": 653 }, "_contentSize": { "__type__": "cc.Size", @@ -15411,14 +15576,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 649 + "__id__": 655 }, "langJson": { "__uuid__": "29631db4-b4d5-4e61-8f1b-092a791be4e1", "__expectedType__": "cc.JsonAsset" }, "loading": { - "__id__": 640 + "__id__": 646 }, "pnl_title": { "__id__": 10 @@ -15427,13 +15592,13 @@ "__id__": 70 }, "list_round_winning": { - "__id__": 605 + "__id__": 611 }, "item_detail": { "__id__": 179 }, "list_detail": { - "__id__": 539 + "__id__": 545 }, "item_symbol": { "__id__": 89 @@ -15442,10 +15607,10 @@ "__id__": 111 }, "flip": { - "__id__": 566 + "__id__": 572 }, "scrollControl": { - "__id__": 564 + "__id__": 570 }, "symbolsAtlas": { "__uuid__": "8562a428-b911-4deb-aa5f-f96968ddc00a", diff --git a/assets/Game/history/scripts/HistoryDetail.ts b/assets/Game/history/scripts/HistoryDetail.ts index 1f0cc86..81d8371 100644 --- a/assets/Game/history/scripts/HistoryDetail.ts +++ b/assets/Game/history/scripts/HistoryDetail.ts @@ -51,6 +51,7 @@ export class HistoryDetail extends Component { lang = "th" data: any = null + currTotalMulti = 0 protected onLoad(): void { @@ -237,9 +238,9 @@ export class HistoryDetail extends Component { let currentRoundBefore = 0; data.panDetails.forEach((pan, index) => { - let isRoundEnd = pan.IsEnd - let isRoundMore = index > 0; - let roundWin = pan.Score || 0; + let isRoundEnd = pan.RoundInfo && pan.RoundInfo.Current === pan.RoundInfo.Total + let isRoundMore = pan.RoundInfo && pan.RoundInfo.Total > 1; + let roundWin = pan.RoundInfo && pan.RoundInfo.AllScoreMul || 0; let obj = { bet: index === 0 ? data.bet : 0, @@ -257,7 +258,7 @@ export class HistoryDetail extends Component { before = pan.Balance - roundWin; after = pan.Balance; isFirstRound = false; - } else if (pan.Index == 0) { + } else if (pan.RoundInfo && pan.RoundInfo.Current == 1) { profit = -data.bet; before = pan.Balance + data.bet - roundWin; after = pan.Balance - roundWin; @@ -267,7 +268,7 @@ export class HistoryDetail extends Component { after = pan.Balance - roundWin; } } else { - profit = roundWin - data.bet; + profit = pan.AllScore - data.bet; before = pan.Balance - profit; after = pan.Balance; isFirstRound = false; @@ -395,11 +396,15 @@ export class HistoryDetail extends Component { let roller_gray = content.getChildByName('Roller').getChildByName('gray'); let roller_wins = content.getChildByName('Roller').getChildByName('icon_wins'); let roller_scatter = content.getChildByName('Roller').getChildByName('icon_scatter'); + let totalMulti = content.getChildByName('Roller').getChildByName('totalMulti'); roller_normal.removeAllChildren(); roller_gray.active = false; roller_wins.removeAllChildren(); roller_scatter.removeAllChildren(); + // let showMulti = pan.WinMultiPlier - pan.WinMultiPlierReal + totalMulti.getComponent(Label).string = this.currTotalMulti <= 0 ? " " : ('x' + this.currTotalMulti) + let upIconIndexs = []; if (winInfo[0] != null) { // 对{}进行遍历 @@ -477,9 +482,6 @@ export class HistoryDetail extends Component { } } - - console.log(roller_gray.active, 'roller_gray.active') - // No Winning Combination let node_no_winning = content.getChildByName("node_no_winning") node_no_winning.active = winInfo[0] == null; @@ -496,7 +498,7 @@ export class HistoryDetail extends Component { let node_win_multiplier_1 = content.getChildByName("node_win_multiplier_1") node_win_multiplier_1.active = false; - if (winInfo[0] != null) { + if (pan.RoundInfo != null) { if (pan.RoundInfo && pan.RoundInfo.Mul > 1) { // let mulDesc = winInfo.MulDesc; let txt_win_multiplier = node_win_multiplier.getChildByName("txt_win_multiplier") @@ -507,12 +509,14 @@ export class HistoryDetail extends Component { txt_win_multiplier_1.getComponent(Label).string = getTranslate(this.dict, "Win Multiplier"); let mulited = node_win_multiplier_1.getChildByName("mulited"); - mulited.getComponent(Label).string = `${currencySymbol} ${fixNum(pan.RoundInfo.Score)}` + ''; + mulited.getComponent(Label).string = `${currencySymbol} ${fixNum(pan.RoundInfo.AllScoreMul)}` + ''; let unmulited = node_win_multiplier_1.getChildByName("unmulited"); - unmulited.getComponent(Label).string = `${currencySymbol} ${fixNum(pan.RoundInfo.AllScoreMul)} x ${pan.RoundInfo.Mul}`; + unmulited.getComponent(Label).string = `${currencySymbol} ${fixNum(pan.RoundInfo.AllScore)} x ${pan.RoundInfo.Mul}`; node_win_multiplier_1.active = true; + + this.currTotalMulti = pan.RoundInfo.Mul } } diff --git a/assets/Main/Scripts/main/loading.ts b/assets/Main/Scripts/main/loading.ts index cbacfb3..57ba57a 100644 --- a/assets/Main/Scripts/main/loading.ts +++ b/assets/Main/Scripts/main/loading.ts @@ -109,7 +109,7 @@ export class Loading extends Component { private async initializeSystem() { this.rb7Logo.active = getIsRB7(); if (DEBUG) { - await getTestToken("yysky", "faketrans"); + await getTestToken("xingxi", "faketrans"); } }