From a6279706a4d04178b48f041860c0620fc942b3b1 Mon Sep 17 00:00:00 2001 From: TJH Date: Wed, 3 Dec 2025 14:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=B4=B9=E8=B5=A0=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Game/scripts/SlotScene.ts | 31 +-- assets/Loading/game.scene | 300 ++++++++++++++---------------- assets/Loading/scripts/comm.ts | 2 +- assets/Loading/scripts/loading.ts | 2 +- 4 files changed, 164 insertions(+), 171 deletions(-) diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index def115e..43bc42b 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -278,13 +278,7 @@ export class SlotScene extends Component { // 如果有frb就不会扣除金额 let frb = GameDataManager.instance.frb; if (frb && frb.Ongoing != null) { - if (!isFreeSpin) { - let count = frb.Ongoing.Frn - 1; - if (count <= 0) { - count = 0; - } - this.SysGift.handleSysInfoFreeCount(count); - } + } else { if (!isFreeSpin) { if (!isFeatureBuy) { @@ -294,7 +288,7 @@ export class SlotScene extends Component { } else { this.slotBar.setBalance( this.slotBar.getBalance() - - this.slotBar.getBet() * this.gameInfo.BuyMul + this.slotBar.getBet() * this.gameInfo.BuyMul ); } } @@ -322,6 +316,21 @@ export class SlotScene extends Component { } GameDataManager.instance.frb = this.spinInfo.Frb; + if (frb) { + let count = 0; + + if (frb.Ongoing != null) { + count = frb.Ongoing.Frn - 1; + } + if (frb.Finished != null) { + count = frb.Finished.Frn; + + } + if (count <= 0) { + count = 0; + } + this.SysGift.handleSysInfoFreeCount(count); + } // if (frb?.Ongoing?.Frn - 1 != GameDataManager.instance.frb?.Ongoing?.Frn) { // this.SysGift.handleSysInfoFreeCount(this.spinInfo.Frb.Ongoing.Frn); // } @@ -905,13 +914,13 @@ export class SlotScene extends Component { this.TipPanel.showTip( title, tip, - null, () => { window.close(); }, - I18nManager.instance.t("AID_ERROR_RETRY_BUTTON"), + null, I18nManager.instance.t("AID_QUIT_RIGHT_BUTTON"), - true + null, + false ); } break; diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index f7800f2..6c127e5 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 87 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 88 + "__id__": 87 }, "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767" }, @@ -77,14 +77,17 @@ "__id__": 8 }, { - "__id__": 65 + "__id__": 64 }, { - "__id__": 68 + "__id__": 67 } ], "_active": true, "_components": [ + { + "__id__": 82 + }, { "__id__": 83 }, @@ -93,9 +96,6 @@ }, { "__id__": 85 - }, - { - "__id__": 86 } ], "_prefab": null, @@ -310,7 +310,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7bc4f08b-8916-4cba-bd93-ff6a63a9a992@f9941", + "__uuid__": "2eb826ea-e65b-40e2-bea0-186d3c5889c4@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -341,11 +341,14 @@ "__id__": 9 }, { - "__id__": 58 + "__id__": 57 } ], "_active": true, "_components": [ + { + "__id__": 60 + }, { "__id__": 61 }, @@ -354,9 +357,6 @@ }, { "__id__": 63 - }, - { - "__id__": 64 } ], "_prefab": null, @@ -402,40 +402,40 @@ "__id__": 10 }, { - "__id__": 14 + "__id__": 13 }, { - "__id__": 18 + "__id__": 17 }, { - "__id__": 22 + "__id__": 21 }, { - "__id__": 29 + "__id__": 28 }, { - "__id__": 36 + "__id__": 35 }, { - "__id__": 39 + "__id__": 38 }, { - "__id__": 42 + "__id__": 41 }, { - "__id__": 45 + "__id__": 44 }, { - "__id__": 48 + "__id__": 47 } ], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 55 }, { - "__id__": 57 + "__id__": 56 } ], "_prefab": null, @@ -484,9 +484,6 @@ }, { "__id__": 12 - }, - { - "__id__": 13 } ], "_prefab": null, @@ -580,19 +577,6 @@ "_atlas": null, "_id": "4ea0Wwq4BDTYhloUtyZnC6" }, - { - "__type__": "e6c8d4szahIuLbtf6yx+hH6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": null, - "spriteName": "loadingBg", - "_id": "0ezPRsajdG94IesVJnsxVX" - }, { "__type__": "cc.Node", "_name": "logo", @@ -604,14 +588,14 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 14 + }, { "__id__": 15 }, { "__id__": 16 - }, - { - "__id__": 17 } ], "_prefab": null, @@ -650,7 +634,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -672,7 +656,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -711,7 +695,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -729,14 +713,14 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 18 + }, { "__id__": 19 }, { "__id__": 20 - }, - { - "__id__": 21 } ], "_prefab": null, @@ -775,7 +759,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -797,7 +781,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -836,7 +820,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -853,19 +837,19 @@ }, "_children": [ { - "__id__": 23 + "__id__": 22 } ], "_active": true, "_components": [ + { + "__id__": 25 + }, { "__id__": 26 }, { "__id__": 27 - }, - { - "__id__": 28 } ], "_prefab": null, @@ -904,16 +888,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 22 + "__id__": 21 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 23 }, { - "__id__": 25 + "__id__": 24 } ], "_prefab": null, @@ -952,7 +936,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 22 }, "_enabled": true, "__prefab": null, @@ -974,7 +958,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 22 }, "_enabled": true, "__prefab": null, @@ -1013,7 +997,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "__prefab": null, @@ -1035,7 +1019,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "__prefab": null, @@ -1074,12 +1058,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "__prefab": null, "_barSprite": { - "__id__": 25 + "__id__": 24 }, "_mode": 0, "_totalLength": 494, @@ -1097,19 +1081,19 @@ }, "_children": [ { - "__id__": 30 + "__id__": 29 } ], "_active": true, "_components": [ + { + "__id__": 32 + }, { "__id__": 33 }, { "__id__": 34 - }, - { - "__id__": 35 } ], "_prefab": null, @@ -1148,16 +1132,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 29 + "__id__": 28 }, "_children": [], "_active": true, "_components": [ { - "__id__": 31 + "__id__": 30 }, { - "__id__": 32 + "__id__": 31 } ], "_prefab": null, @@ -1196,7 +1180,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -1218,7 +1202,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -1257,7 +1241,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -1279,7 +1263,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -1295,7 +1279,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -1341,10 +1325,10 @@ "_active": true, "_components": [ { - "__id__": 37 + "__id__": 36 }, { - "__id__": 38 + "__id__": 37 } ], "_prefab": null, @@ -1383,7 +1367,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 35 }, "_enabled": true, "__prefab": null, @@ -1405,7 +1389,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 35 }, "_enabled": true, "__prefab": null, @@ -1450,10 +1434,10 @@ "_active": true, "_components": [ { - "__id__": 40 + "__id__": 39 }, { - "__id__": 41 + "__id__": 40 } ], "_prefab": null, @@ -1492,7 +1476,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 38 }, "_enabled": true, "__prefab": null, @@ -1514,7 +1498,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 38 }, "_enabled": true, "__prefab": null, @@ -1582,10 +1566,10 @@ "_active": true, "_components": [ { - "__id__": 43 + "__id__": 42 }, { - "__id__": 44 + "__id__": 43 } ], "_prefab": null, @@ -1624,7 +1608,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1646,7 +1630,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 41 }, "_enabled": true, "__prefab": null, @@ -1714,10 +1698,10 @@ "_active": true, "_components": [ { - "__id__": 46 + "__id__": 45 }, { - "__id__": 47 + "__id__": 46 } ], "_prefab": null, @@ -1756,7 +1740,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 44 }, "_enabled": true, "__prefab": null, @@ -1778,7 +1762,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 44 }, "_enabled": true, "__prefab": null, @@ -1844,19 +1828,19 @@ }, "_children": [ { - "__id__": 49 + "__id__": 48 } ], "_active": false, "_components": [ + { + "__id__": 51 + }, { "__id__": 52 }, { "__id__": 53 - }, - { - "__id__": 54 } ], "_prefab": null, @@ -1895,16 +1879,16 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 48 + "__id__": 47 }, "_children": [], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 49 }, { - "__id__": 51 + "__id__": 50 } ], "_prefab": null, @@ -1943,7 +1927,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -1965,7 +1949,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -2027,7 +2011,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -2049,7 +2033,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -2088,13 +2072,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 47 }, "_enabled": true, "__prefab": null, "clickEvents": [ { - "__id__": 55 + "__id__": 54 } ], "_interactable": true, @@ -2146,7 +2130,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 48 + "__id__": 47 }, "_id": "54j4lwPyZHbqqANZE+r9Tj" }, @@ -2224,10 +2208,10 @@ "_active": true, "_components": [ { - "__id__": 59 + "__id__": 58 }, { - "__id__": 60 + "__id__": 59 } ], "_prefab": null, @@ -2266,7 +2250,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -2288,7 +2272,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -2432,10 +2416,10 @@ "_active": true, "_components": [ { - "__id__": 66 + "__id__": 65 }, { - "__id__": 67 + "__id__": 66 } ], "_prefab": null, @@ -2474,7 +2458,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2496,7 +2480,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2539,22 +2523,22 @@ }, "_children": [ { - "__id__": 69 + "__id__": 68 }, { - "__id__": 73 + "__id__": 72 }, { - "__id__": 78 + "__id__": 77 } ], "_active": false, "_components": [ { - "__id__": 81 + "__id__": 80 }, { - "__id__": 82 + "__id__": 81 } ], "_prefab": null, @@ -2593,19 +2577,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 69 + }, { "__id__": 70 }, { "__id__": 71 - }, - { - "__id__": 72 } ], "_prefab": null, @@ -2644,7 +2628,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2666,7 +2650,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2678,7 +2662,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2717,11 +2701,14 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 73 + }, { "__id__": 74 }, @@ -2730,9 +2717,6 @@ }, { "__id__": 76 - }, - { - "__id__": 77 } ], "_prefab": null, @@ -2771,7 +2755,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 72 }, "_enabled": true, "__prefab": null, @@ -2793,7 +2777,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 72 }, "_enabled": true, "__prefab": null, @@ -2855,7 +2839,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 72 }, "_enabled": true, "__prefab": null, @@ -2868,7 +2852,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 72 }, "_enabled": true, "__prefab": null, @@ -2898,16 +2882,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 78 }, { - "__id__": 80 + "__id__": 79 } ], "_prefab": null, @@ -2946,7 +2930,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 78 + "__id__": 77 }, "_enabled": true, "__prefab": null, @@ -2968,7 +2952,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 78 + "__id__": 77 }, "_enabled": true, "__prefab": null, @@ -3007,7 +2991,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -3029,7 +3013,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -3108,25 +3092,25 @@ "__id__": 9 }, "progressBar": { - "__id__": 28 + "__id__": 27 }, "progressLabel": { - "__id__": 41 + "__id__": 40 }, "loadingTipLabel": { - "__id__": 44 + "__id__": 43 }, "retryTipLabel": { - "__id__": 47 + "__id__": 46 }, "startBtn": { - "__id__": 54 + "__id__": 53 }, "startBtnLabel": { - "__id__": 51 + "__id__": 50 }, "GameNode": { - "__id__": 58 + "__id__": 57 }, "languageJson": { "__uuid__": "65d2a408-9396-47e4-99de-73423a590b7f", @@ -3148,10 +3132,10 @@ "__id__": 5 }, "Logo": { - "__id__": 65 + "__id__": 64 }, "rotateNode": { - "__id__": 68 + "__id__": 67 }, "_id": "d8F/UwpTxNpZhwSJjDvnkk" }, @@ -3166,28 +3150,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 89 + "__id__": 88 }, "shadows": { - "__id__": 90 + "__id__": 89 }, "_skybox": { - "__id__": 91 + "__id__": 90 }, "fog": { - "__id__": 92 + "__id__": 91 }, "octree": { - "__id__": 93 + "__id__": 92 }, "skin": { - "__id__": 94 + "__id__": 93 }, "lightProbeInfo": { - "__id__": 95 + "__id__": 94 }, "postSettings": { - "__id__": 96 + "__id__": 95 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index ce8d95e..bcb0856 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -32,7 +32,7 @@ export function getHistoryUrl() { } export function getLanguage() { - // return 'my'; + return 'zh'; return language; } diff --git a/assets/Loading/scripts/loading.ts b/assets/Loading/scripts/loading.ts index d742e84..69db5df 100644 --- a/assets/Loading/scripts/loading.ts +++ b/assets/Loading/scripts/loading.ts @@ -67,7 +67,7 @@ export class LoadingUI extends Component { this.node.getChildByName('Logo').active = getIsRB7(); await I18nManager.instance.init(getLanguage(), this.languageJson); I18nManager.instance.updateSceneRenderers(); - this.LoadingUINode.getChildByName("bg").getComponent(LocalizedSprite).fetchRender(); + // this.LoadingUINode.getChildByName("bg").getComponent(LocalizedSprite).fetchRender(); this.LoadingUINode.active = true; // 更新进度条到 0.4 this.updateProgress(0.4);