diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 51e2c25..2bc5791 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c1NdgRFSRMs5fzRZAzx/JU" + "fileId": "4eNsDp9jhB4IThw4aZiA9c" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "fca578E9ZH8pVS7ElHAOXQ", + "fileId": "4dQsMV1gdFBbUQjZ6iTStV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "48F/rgGkhA6IK4M9BmhCto" + "fileId": "0bgUx6AN5PJ5un3/rYc3c3" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "0618ioG69P3ptEtRYqFL5N", + "fileId": "75pGP/dXBECJolIlwO0XQd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1cdA2E1y5Lip0rkrJnM3dP" + "fileId": "5fz2b1g0VE9a/1NP+Qk2E+" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6cFnolnXhG8KWHAYjGG9qo" + "fileId": "1bYBQ+vRtKK6BGBGj8ZW/B" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "a3t0DBextMg6n4Vslqwwqx", + "fileId": "d4XQ+v0KdLYrUQuqB0S8Nt", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1eU+N+YhtEh5VkZ6ZNw9Af" + "fileId": "0epWIq399HnpseL59YGFUx" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "75Ckds/n1EEZhDkIzapgyb" + "fileId": "cfBdRvCWhCjIiiegMVb943" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e72tiXEltH/qJBabt9Bqrg" + "fileId": "1b8XLE0oFOkb3QGOU7xBW/" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "a3z0ejp+9Pd51zisLV6cTf", + "fileId": "a6XW7siLhCZI4vwT80kC8f", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "71oG+z0YhIiLB8GjG6nKyQ" + "fileId": "e3RGnvYOtPtJ7ltkdkH7LR" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "dcQnQ/UApG5qZx48IJczEn", + "fileId": "94MRW6XfJK54WSeIyOGDwX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "efNtN1iLNNPJg0WjtGhzGq" + "fileId": "c8Egadw/FH04X7FEeg4IdU" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "d7mCsEj2hCi6PBvd1US8qy", + "fileId": "9esVylC3ZEU6Qmt7xwmQy4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76MEjzTb5OuoCmztZofT1c" + "fileId": "37XlQ7hapLw4nfgWogk61X" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5qWC5q1pG8YnGr4euBmu1" + "fileId": "f7b53c9C5Glr6kq6KBHypJ" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "ac/EiDTUpG7KeB8IvMQMR4", + "fileId": "96z+TKSqpKF691iQNaBJU/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "22LnjBqr1ND6b0vUas+s8+" + "fileId": "e4WlBccZBIbZpr/Jmk9wmz" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "daSL555TlB67ZT8OXpTpHb", + "fileId": "e7PebCwLhFnJe/HlrrFR7Y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "efBl6MWA5FzJvwzgea8oaN" + "fileId": "a4DbksdoJBYrEUitO5Y+/s" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9rwC/E/FL0r5Cpyn4+n4d", + "fileId": "61jRmIWIpFV6gEzAuNdzsK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "18ptbiEwFKHbyBQzmIO+40" + "fileId": "e92O5d4ppCK6lzmZAhF3wu" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23+12AGddFVqUaQMTvUYst" + "fileId": "04puXD6FRLsYM2NrSSXapL" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "5bruyp70tFfpmJyHcx6Jpc", + "fileId": "9d74scKSlKUqnc2788w+zx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d9t3umvbVJfoI4rE+lp0oU" + "fileId": "1eiWdb4eZB2bilWsTuWXrg" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "f9OuJnOdBPN5ILAsuF90bu", + "fileId": "fcRyZd3pBFb4b5SHRNsR5s", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "68JXYFtRxAWZkjfp7b9uXV" + "fileId": "24YWNWGjRK2ZLL8MFqmIhO" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "86T+u1N2NI+67dMjQtCcbI", + "fileId": "2dr0ZpU2xJcK8RqtLnQhKY", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b5Ra7nFq1McaOUUjgyD3Af" + "fileId": "199wN+5idOWJQF0IOJjSL/" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "311PVhY8pMcKiGU+juYO1U" + "fileId": "daCs7p7EVMGKxOiA6qheya" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "11sBauRcBM37CFRFCBuGu9", + "fileId": "4d/MhFCTZNe6X2oi7nZ2dE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23GWoX1XVDI4spLhff0r1p" + "fileId": "287aSkdERLc5hDJ+m5TxSr" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "72j5mFEk9J2Zamb4YTb8li", + "fileId": "1dxVoJ+5tNNrn0HxIlmME8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c57K8T8zhE7oWrBuafCqgQ" + "fileId": "9cY+/NMa1E+4hse+fFgTZM" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "31zjzlSyFNnaRfTh07fosp", + "fileId": "a0aHJoloVDcqstauu0SeAV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "70w8KoxFJMWo2BSh16kBCP" + "fileId": "44V6zggPBDu4mWWiTBMLKs" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81pv0R/QJBioI9kzUC8qCO" + "fileId": "bb5b8sX6hEq6bT6M4i1IP3" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "feuxpTpmdB05GDY327JLmA", + "fileId": "7fLaq7hkRJabTE5uH9put/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cf1HExiiROL7syzm4r/FHu" + "fileId": "29+O+ChPdEToYdO0+i7nGa" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "0eyP1iPQZFVJh7o5qxCCaQ", + "fileId": "ceSDSZpsJGApTaqwC88bN6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39L7FO3kxCPJZGi2nQQfnZ" + "fileId": "daGyu9wX1KTI+82qGN5rnh" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "15RQQqWp9KsJvCS3I7EXWl", + "fileId": "39dPRQfq5Hx7PxfaYsSwVA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0aLwEQO89GIb3hNnxnwgUO" + "fileId": "2e7ZZBpbJATKfGKUoWnyH8" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "35qDLsxRlOO66NBhs3Y4VV" + "fileId": "82b/ZaQqFC+Iio4+DXIQzr" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "89A4mgC49GUY7FXn/+df/w", + "fileId": "89L+4DS0BCy50qbQDSUJG/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "71WvU3IddDzranDP5hQLUQ" + "fileId": "0bUe3EuwpDS6eVRSIZsBkF" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "fbu2dGY2VB2IF3nDWT0oOe", + "fileId": "d3HF+bJUBP6qrnRcIb7QVl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1577IKvzhL/oZl80uNqIja" + "fileId": "76flDmRB1BLZEySUwxihGB" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "f7BJq4eHFKnIwFyYp9TRkw", + "fileId": "45IsRPTltNB551Q+psYKDT", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5w8Sc/35J4rOSdTT4hjVK" + "fileId": "23GYp19XpFBI5h0LOh2K5B" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "18r1eoGQpIE45mo7CXT8yn" + "fileId": "55U4JVvtlEoKzUYD4mrD6G" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "deMWS3shhKnJiprGsLjR+u", + "fileId": "65NDAqtclKuqIkbXlr6l6a", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76m/iaIXFFQZp7IsG4GEqy" + "fileId": "a7HiAlgvdHyZqEUiWiQCzG" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5eYZRfXcxCk4SreZUnW2bz" + "fileId": "e5gp7v+t1GtZC9vfdAKW8Z" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eEzhNXFZDsJucCAwXNBaX" + "fileId": "e618Bt/KxC2IkQ3C0ezsR3" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "ceNATgYQVHr6FR0tbyhDRt", + "fileId": "e5z5WGsxZDHJs5DyXkLJVq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -12292,7 +12292,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22322,7 +22322,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22487,7 +22487,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22682,7 +22682,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22834,7 +22834,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22986,7 +22986,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -23138,7 +23138,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28659,7 +28659,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28763,7 +28763,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1919.9999999999998 + "height": 1920.0000000000002 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index fde05f8..df819a2 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -4,7 +4,7 @@ import { SlotBar } from './SlotBar'; import { SlotGame } from './SlotGame'; import { BigWinUI } from './game/BigWinUI'; import { GameDataManager } from '../../Loading/scripts/manager/GameDataManager'; -import { callGameApi } from '../../Loading/scripts/comm'; +import { callGameApi, getIsFrom } from '../../Loading/scripts/comm'; import { TipPanel } from './game/TipPanel'; import { I18nManager } from '../../Loading/scripts/manager/I18nManager'; import { TotalWin } from './game/TotalWin'; @@ -864,8 +864,14 @@ export class SlotScene extends Component { this.TipPanel.showTip( I18nManager.instance.t('AID_QUIT'), I18nManager.instance.t('Are you sure you want to exit?'), + () => { - window.close(); + let isFrom = getIsFrom() + if (!isFrom) { + window.close(); + } else { + window.location.replace(isFrom) + } } ); } diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index 3c16ce2..3de77de 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -187,7 +187,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 959.9999999999999, + "_orthoHeight": 960.0000000000001, "_near": 0, "_far": 2000, "_color": { diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index dc1f6a7..f5bb619 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -5,11 +5,14 @@ import { log, path } from "cc" import { PREVIEW } from "cc/env" const gameId = "rp_10012"; +const qs = new URLSearchParams(location.search) + // let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; let apiaddr = ""; -let token = "eyJQIjoxMDA5NDksIkUiOjE3NjA1NDExNDIsIlMiOjk5OSwiRCI6InJwXzEwMDEyIn0.g10EbxTKyLC-p1617ni3PIt44NWI84xaSQx8LM9lulo"; +let token = "eyJQIjoxMDA3NzksIkUiOjE3NjEyNDMzNjEsIlMiOjEwMDIsIkQiOiJycF8xMDAxMCJ9.gS0Fd-E1jty1-cIcoXK11sr4PYVjvYSKECwt5q_lbSo"; let language = "en" let currency = "THB" +let isfrom = null let supportUrl = "" let oddsUrl = "" let historyUrl = "" @@ -35,6 +38,11 @@ export function getIsRB7() { // return true; return isRB7; } + +export function getIsFrom() { + // return null; + return isfrom; +} export function initReqAddr() { let partHost = ".rpfafafahkdev.com"; if (!PREVIEW) { @@ -50,6 +58,11 @@ export function initReqAddr() { if (c) { currency = c } + + const from = qs.get("from"); + if (from) { + isfrom = from + } // brand=rb7 const rb7 = qs.get("brand"); if (rb7) {