From 4d939911b500d3c341c0b78b81e72fe65c0661a5 Mon Sep 17 00:00:00 2001 From: JianMiau Date: Wed, 23 Nov 2022 11:58:01 +0800 Subject: [PATCH] [add] 1305 --- src/script/BJ_Casino_BotController.ts | 216 +++++++----- src/script/Base/BusinessTypeSetting.ts | 438 ++++++++++++------------ src/script/Common/Game/Base/Slot.ts | 2 + src/script/Common/Game/Base/SlotBase.ts | 7 +- src/script/Common/Game/Slot1305.ts | 13 + src/script/Common/Game/Slot65.ts | 13 + 6 files changed, 379 insertions(+), 310 deletions(-) create mode 100644 src/script/Common/Game/Slot1305.ts create mode 100644 src/script/Common/Game/Slot65.ts diff --git a/src/script/BJ_Casino_BotController.ts b/src/script/BJ_Casino_BotController.ts index 5fea22a..1b9bb8a 100644 --- a/src/script/BJ_Casino_BotController.ts +++ b/src/script/BJ_Casino_BotController.ts @@ -4,122 +4,150 @@ import { Ref, ref } from "vue"; import MainControl, { DownloadForm } from "./Common/MainControl/MainControl"; export class BJ_Casino_BotController { - //#region Lifecycle + //#region Lifecycle - public Hostport: any[] = ["不選擇環境", "內版", "肉乾", "賴宏", "40", "送審", "外版", "testing1", "testing2", "testing3"]; + public Hostport: any[] = ["不選擇環境", "內版", "Test", "肉乾9006", "肉乾9007", "肉乾9008", "肉乾9009", "賴宏", "40", "送審", "外版", "testing1", "testing2", "testing3"]; - public ServerIndedx: number = 6; + public ServerIndedx: number = 10; - public ServerDefault: Ref = ref(this.Hostport[this.ServerIndedx]); + public ServerDefault: Ref = ref(this.Hostport[this.ServerIndedx]); - //#endregion + //#endregion - //#region get set + //#region get set - // public get Host(): string { return this.Host; } - // public get Port(): string { return this.Port; } + // public get Host(): string { return this.Host; } + // public get Port(): string { return this.Port; } - //#endregion + //#endregion - //#region Lifecycle + //#region Lifecycle - /** - * - */ - constructor() { - this.onLoad(); - } + /** + * + */ + constructor() { + this.onLoad(); + } - public async onLoad(): Promise { - // await LazyLoad.Init(); - import("dayjs/locale/zh-tw"); - dayjs.locale("zh-tw"); - // this.BJ_Casino = client.BJ_Casino; - await MainControl.DownloadForm(DownloadForm.FormType.Formread); - } + public async onLoad(): Promise { + // await LazyLoad.Init(); + import("dayjs/locale/zh-tw"); + dayjs.locale("zh-tw"); + // this.BJ_Casino = client.BJ_Casino; + await MainControl.DownloadForm(DownloadForm.FormType.Formread); + } - //#endregion + //#endregion - //#region Custom + //#region Custom - public GetServer(): any { - let resp: Object = {}; - switch (this.ServerIndedx) { - // 不選擇環境 - case 0: - // 外網連內版 - case 1: { - resp["host"] = "http://220.134.195.1"; - resp["port"] = "19005"; - break; - } + public GetServer(): any { + let resp: Object = {}; + switch (this.ServerIndedx) { + // 不選擇環境 + case 0: + // 外網連內版 + case 1: { + resp["host"] = "http://220.134.195.1"; + resp["port"] = "19005"; + break; + } - // 肉乾 - case 2: { - resp["host"] = "http://192.168.5.230"; - resp["port"] = "9006"; - break; - } + // Test + case 2: { + resp["host"] = "https://bot.online-bj.com"; + resp["port"] = "9005"; + break; + } - // 賴宏 - case 3: { - resp["host"] = "http://192.168.5.134"; - resp["port"] = "9005"; - break; - } + // 肉乾9006 + case 3: { + resp["host"] = "http://192.168.5.230"; + resp["port"] = "9006"; + break; + } - // 40 - case 4: { - resp["host"] = "http://192.168.5.12"; - resp["port"] = "9487"; - break; - } + // 肉乾9007 + case 4: { + resp["host"] = "http://192.168.5.230"; + resp["port"] = "9007"; + break; + } - // 送審 - case 5: { - resp["host"] = "https://submit.online-bj.com"; - resp["port"] = "9005"; - break; - } + // 肉乾9008 + case 5: { + resp["host"] = "http://192.168.5.230"; + resp["port"] = "9008"; + break; + } - // 外版 - case 6: { - resp["host"] = "https://game.online-bj.com"; - resp["port"] = "9005"; - break; - } + // 肉乾9009 + case 6: { + resp["host"] = "http://192.168.5.230"; + resp["port"] = "9009"; + break; + } - // testing1 - case 7: { - resp["host"] = "http://bj-testing1.casino.catan.com.tw"; - resp["port"] = "9005"; - break; - } + // 賴宏 + case 7: { + resp["host"] = "http://192.168.5.134"; + resp["port"] = "9005"; + break; + } - // testing2 - case 8: { - resp["host"] = "http://bj-testing2.casino.catan.com.tw"; - resp["port"] = "9005"; - break; - } + // 40 + case 8: { + resp["host"] = "http://192.168.5.12"; + resp["port"] = "9487"; + break; + } - // testing3 - case 9: { - resp["host"] = "http://bj-testing3.casino.catan.com.tw"; - resp["port"] = "9005"; - break; - } + // 送審 + case 9: { + resp["host"] = "https://submit.online-bj.com"; + resp["port"] = "9005"; + break; + } - default: { - break; - } - } - return resp; - } + // 外版 + case 10: { + resp["host"] = "https://game.online-bj.com"; + resp["port"] = "9005"; + break; + } - public SelectServer(data: number): void { - this.ServerIndedx = data; - } + // testing1 + case 11: { + resp["host"] = "http://bj-testing1.casino.catan.com.tw"; + resp["port"] = "9005"; + break; + } - //#endregion + // testing2 + case 12: { + resp["host"] = "http://bj-testing2.casino.catan.com.tw"; + resp["port"] = "9005"; + break; + } + + // testing3 + case 13: { + resp["host"] = "http://bj-testing3.casino.catan.com.tw"; + resp["port"] = "9005"; + break; + } + + default: { + break; + } + } + return resp; + } + + public SelectServer(data: number): void { + this.ServerIndedx = data; + } + + //#endregion } diff --git a/src/script/Base/BusinessTypeSetting.ts b/src/script/Base/BusinessTypeSetting.ts index 6c0d7dd..b1a77ea 100644 --- a/src/script/Base/BusinessTypeSetting.ts +++ b/src/script/Base/BusinessTypeSetting.ts @@ -1,26 +1,30 @@ export module BusinessEnum { - export enum BusinessType { - Type1 = "H5", - Type2 = "App" - } - export enum ServerType { - /** WEB格式 */ - Web = 1, - /** 外版 */ - Out = 2, - /** 送審環境 */ - Submit = 3, - /** 內版商業DEMO測試(B2B) */ - Internal_release = 4, - /** 內版開發(內網&4G) */ - Internal_Dev = 5, - /** 外部商業DEMO(B2B) */ - Out_B2B = 6 - } - export enum LogoType { - /** 完美(目前只有WEB) */ - WM = 1 - } + export enum BusinessType { + Type1 = "H5", + Type2 = "App" + } + export enum ServerType { + /** WEB格式 */ + Web = 1, + /** 外版 */ + Out = 2, + /** 送審環境 */ + Submit = 3, + /** 內版商業DEMO測試(B2B) */ + Internal_release = 4, + /** 內版開發(內網&4G) */ + Internal_Dev = 5, + /** 外部商業DEMO(B2B) */ + Out_B2B = 6, + /** QA */ + QA = 7, + /** Test */ + Test = 8 + } + export enum LogoType { + /** 完美(目前只有WEB) */ + WM = 1 + } } /** @@ -29,209 +33,215 @@ export module BusinessEnum { @explain 遊戲一定都一樣不能改動介面 */ export default class BusinessTypeSetting { - /** 產品商業類別字串(組合判斷用) */ - public static readonly TYPE_BUSINESS: string = "App"; - /** 編譯版本 */ - public static readonly COMPILE_VERSION: string = "1.4.1"; - /** 編譯程式碼版號 */ - public static readonly SCRIPT_BUNLE_LIST: string[] = [ - "FormTableScript", "CommonScript", "ElementUIScript", "LoginScript", "LobbyScript", "SlotScript" - ]; - public static readonly ART_UI_BUNLE_LIST: string[] = [ - "Common", "CommonSound", "Login", "Lobby", "GameCommon", - "Game_BottomUI_SD", "Game_BigWinJackpot", "GameMessage", "CommonLanguageTexture", "MainControl", - "BindAccount", "SettingPanel", "Shop", "Vip", "Ad", - "Mail", "Chat", "PlayerInfo", "Rank", "Gift", - "ResourceItem", "Backpack", "GettingPanel", "Activity", "Game_BottomUI_BJ" - ]; - public static readonly DEV_ART_UI_BUNLE_LIST: string[] = [ + /** 產品商業類別字串(組合判斷用) */ + public static readonly TYPE_BUSINESS: string = "App"; + /** 編譯版本 */ + public static readonly COMPILE_VERSION: string = "1.7.1"; + /** 編譯程式碼版號 */ + public static readonly SCRIPT_BUNLE_LIST: string[] = [ + "FormTableScript", "CommonScript", "ElementUIScript", "LoginScript", "LobbyScript", "SlotScript" + ]; + public static readonly ART_UI_BUNLE_LIST: string[] = [ + "Common", "CommonSound", "Login", "Lobby", "GameCommon", + "Game_BottomUI_SD", "Game_BigWinJackpot", "GameMessage", "CommonLanguageTexture", "MainControl", + "BindAconsoleount", "SettingPanel", "Shop", "Vip", "Ad", + "Mail", "Chat", "PlayerInfo", "Rank", "Gift", + "ResourceItem", "Backpack", "GettingPanel", "Activity", "Game_BottomUI_BJ" + ]; + public static readonly DEV_ART_UI_BUNLE_LIST: string[] = [ - ] - public static readonly ART_GAME_BUNLE_LIST: string[] = [ - "Game_1201", "Game_1202", "Game_1302" - ] - public static readonly ART_REMOTE_GAME_BUNLE_LIST: string[] = [ - "Game_1", "Game_2", "Game_5", "Game_8", "Game_9", - "Game_10", "Game_12", "Game_15", "Game_16", "Game_18", - "Game_23", "Game_24", "Game_25", "Game_26", "Game_27", - "Game_28", "Game_29", "Game_30", "Game_32", "Game_33", - "Game_34", "Game_35", "Game_37", "Game_36", "Game_40", - "Game_44", "Game_48", "Game_50", "Game_51", "Game_58", - "Game_1101", "Game_1401", "Game_1501", "Game_2001", "Game_2003", - "Game_3002", "Game_3003", "Game_3012", - ] - /** 送審旗標(讀取外版自動判斷是否送審) */ - public static IsSubmit: boolean = false; - /** 跑送審2的手動旗標(若是送審且設為true跑2號環境) */ - public static IsSubmitTestFlight: boolean = false; - /** B2B手動旗標(true寫死B2B環境) */ - public static IsB2B: boolean = false; + ] + public static readonly ART_GAME_BUNLE_LIST: string[] = [ + "Game_1201", "Game_1202", "Game_1302" + ] + public static readonly ART_REMOTE_GAME_BUNLE_LIST: string[] = [ + "Game_1", "Game_2", "Game_5", "Game_8", "Game_9", + "Game_10", "Game_12", "Game_15", "Game_16", "Game_18", + "Game_23", "Game_24", "Game_25", "Game_26", "Game_27", + "Game_28", "Game_29", "Game_30", "Game_32", "Game_33", + "Game_34", "Game_35", "Game_37", "Game_36", "Game_40", + "Game_44", "Game_48", "Game_50", "Game_51", "Game_58", + "Game_1101", "Game_1401", "Game_1501", "Game_2001", "Game_2003", + "Game_3002", "Game_3003", "Game_3012", + ] + /** 送審旗標(讀取外版自動判斷是否送審) */ + public static IsSubmit: boolean = false; + /** 跑送審2的手動旗標(若是送審且設為true跑2號環境) */ + public static IsSubmitTestFlight: boolean = false; + /** B2B手動旗標(true寫死B2B環境) */ + public static IsB2B: boolean = false; - /** 商業LOGO圖代碼(讀同一張表但UI有改的設定) */ - public static Logo: number = null; - /** 連線IP(網頁版會接網址參數所以要多開變數直接指定) */ - public static UseHost: string = null; - /** 連接阜(網頁版會接網址參數所以要多開變數直接指定) */ - public static UsePort: number = null; - /** 資源伺服器網址 */ - public static UsePatch: string = null; - /** 帳號 */ - public static Account: string = null; - /** 密碼 */ - public static Password: string = null; + /** 商業LOGO圖代碼(讀同一張表但UI有改的設定) */ + public static Logo: number = null; + /** 連線IP(網頁版會接網址參數所以要多開變數直接指定) */ + public static UseHost: string = null; + /** 連接阜(網頁版會接網址參數所以要多開變數直接指定) */ + public static UsePort: number = null; + /** 資源伺服器網址 */ + public static UsePatch: string = null; + /** 帳號 */ + public static Aconsoleount: string = null; + /** 密碼 */ + public static Password: string = null; - // ======================================================================================= - /** 執行環境ProductEnum.ServerType */ - public static UseServerTpye: BusinessEnum.ServerType = BusinessEnum.ServerType.Web; - /** 網頁是否在伺服器上 */ - public static readonly CheckOnServer: boolean = - window.location.href.indexOf("localhost") == -1 - && window.location.href.indexOf("/build/") == -1; - /** 網頁測試讀取對應資源的位置 */ - public static readonly FolderUrlImg: string = "shared/img/"; - public static readonly FolderUrlBg: string = "shared/bg/"; - public static readonly FolderUrlJson: string = "shared/jsons/"; - public static readonly FolderUrlTxt: string = "shared/txt/"; - public static readonly FolderUrlLoading: string = "shared/loading/"; - public static readonly FolderUrlMp3: string = "shared/"; - public static readonly FolderUrlBundle: string = `Bundle_${true ? "Debug" : "Release"}/`; - public static readonly FolderOS: string = "Android/"; - /**遠端Bundle路徑為: URL + BundleName.非遊戲資源到各自平台資料夾找BUNDLE */ - public static GetRemoteFileUrl(bundleName: string): string { - let gameNumber: string = bundleName.split("Game_")[1]; - var regExp: RegExp = /^[0-9]+$/; - let isGame: boolean = regExp.test(gameNumber); - let bundleUrl: string = `${BusinessTypeSetting.UsePatch}${BusinessTypeSetting.FolderUrlBundle}`; - if (isGame) { - bundleUrl = `${bundleUrl}${bundleName}`; - } else { - bundleUrl = `${bundleUrl}${BusinessTypeSetting.FolderOS}${bundleName}`; - } - return bundleUrl; - } - /** - * 取得PACH資原路徑 - * @param type 執行環境() - * @returns - */ - public static GetPatchUrl(type: BusinessEnum.ServerType): string { - if (this.UseServerTpye == BusinessEnum.ServerType.Web) { - // TYP2網頁版資源路路徑判斷 - if (this.CheckOnServer) { - return "../shared/"; - } else { - return "http://patch-dev.online-bj.com//shared/"; - } - } - switch (type) { - case BusinessEnum.ServerType.Out: - return "https://patch.online-bj.com/game/"; - case BusinessEnum.ServerType.Submit: - if (!this.IsSubmitTestFlight) { - return "https://patch-submit.online-bj.com/game/"; - } else { - return "https://patch-submit2.online-bj.com/game/"; - } + // ======================================================================================= + /** 執行環境ProductEnum.ServerType */ + public static UseServerTpye: BusinessEnum.ServerType = BusinessEnum.ServerType.Web; + /** 網頁是否在伺服器上 */ + public static readonly CheckOnServer: boolean = + window.location.href.indexOf("localhost") == -1 + && window.location.href.indexOf("/build/") == -1; + /** 網頁測試讀取對應資源的位置 */ + public static readonly FolderUrlImg: string = "shared/img/"; + public static readonly FolderUrlBg: string = "shared/bg/"; + public static readonly FolderUrlJson: string = "shared/jsons/"; + public static readonly FolderUrlTxt: string = "shared/txt/"; + public static readonly FolderUrlLoading: string = "shared/loading/"; + public static readonly FolderUrlMp3: string = "shared/"; + public static readonly FolderUrlBundle: string = `Bundle_${true ? "Debug" : "Release"}/`; + public static readonly FolderOS: string = "Android/"; + /**遠端Bundle路徑為: URL + BundleName.非遊戲資源到各自平台資料夾找BUNDLE */ + public static GetRemoteFileUrl(bundleName: string): string { + let gameNumber: string = bundleName.split("Game_")[1]; + var regExp: RegExp = /^[0-9]+$/; + let isGame: boolean = regExp.test(gameNumber); + let bundleUrl: string = `${BusinessTypeSetting.UsePatch}${BusinessTypeSetting.FolderUrlBundle}`; + if (isGame) { + bundleUrl = `${bundleUrl}${bundleName}`; + } else { + bundleUrl = `${bundleUrl}${BusinessTypeSetting.FolderOS}${bundleName}`; + } + return bundleUrl; + } + /** + * 取得PACH資原路徑 + * @param type 執行環境() + * @returns + */ + public static GetPatchUrl(type: BusinessEnum.ServerType): string { + if (this.UseServerTpye === BusinessEnum.ServerType.Web) { + // TYP2網頁版資源路路徑判斷 + if (this.CheckOnServer) { + return "../shared/"; + } else { + return "http://patch-dev.online-bj.com//shared/"; + } + } + switch (type) { + case BusinessEnum.ServerType.Out: + return "https://patch.online-bj.com/game/"; + case BusinessEnum.ServerType.Submit: + return "https://patch-submit.online-bj.com/game/"; - case BusinessEnum.ServerType.Out_B2B: - return "https://patch-demo.online-bj.com/game/"; - case BusinessEnum.ServerType.Internal_release: - return "http://patch-release.online-bj.com/"; + case BusinessEnum.ServerType.Out_B2B: + return "https://patch-demo.online-bj.com/game/"; + case BusinessEnum.ServerType.Internal_release: + return "http://patch-release.online-bj.com/"; - case BusinessEnum.ServerType.Internal_Dev: - return "http://patch-dev.online-bj.com/"; + case BusinessEnum.ServerType.Internal_Dev: + return "http://patch-dev.online-bj.com/"; - default: - console.warn("GetPatchUrl Uncheck ServerType."); - return "http://patch-dev.online-bj.com/"; - } - } - /** - * 取得連線伺服器IP - * @param type 執行環境 - * @returns - */ - public static GetHostUrl(type: BusinessEnum.ServerType): string { - if (this.UseServerTpye == BusinessEnum.ServerType.Web) { - return "app.casino.catan.com.tw"; - } - switch (type) { - case BusinessEnum.ServerType.Out: - return "https://game.online-bj.com"; - case BusinessEnum.ServerType.Submit: - if (!this.IsSubmitTestFlight) { - return "https://submit.online-bj.com"; - } else { - return "https://submit2.online-bj.com"; - } + case BusinessEnum.ServerType.QA: + return "https://patch-qa.online-bj.com/game/"; - case BusinessEnum.ServerType.Out_B2B: - return "https://demo.online-bj.com"; - case BusinessEnum.ServerType.Internal_release: - return "https://demo.online-bj.com"; + case BusinessEnum.ServerType.Test: + return "https://patch-bot.online-bj.com/game/"; - case BusinessEnum.ServerType.Internal_Dev: - return "http://220.134.195.1"; + default: + console.warn("GetPatchUrl Uncheck ServerType."); + return "http://patch-dev.online-bj.com/"; + } + } + /** + * 取得連線伺服器IP + * @param type 執行環境 + * @returns + */ + public static GetHostUrl(type: BusinessEnum.ServerType): string { + if (this.UseServerTpye === BusinessEnum.ServerType.Web) { + return "app.casino.catan.com.tw"; + } + switch (type) { + case BusinessEnum.ServerType.Out: + return "https://game.online-bj.com"; + case BusinessEnum.ServerType.Submit: + return "https://submit.online-bj.com"; - default: - console.warn("GetHostUrl Uncheck ServerType."); - // 只有內網可憐IP - return "app.casino.catan.com.tw"; - } - } - /** - * 取得伺服器連接端口 - * @param type 執行環境 - * @returns - */ - public static GetPortNum(type: BusinessEnum.ServerType): number { - if (this.UseServerTpye == BusinessEnum.ServerType.Web) { - // 網頁版測試專用.正式接網頁參數 - return 9005; - } - switch (type) { - case BusinessEnum.ServerType.Out: - return 9005; - case BusinessEnum.ServerType.Submit: - if (!this.IsSubmitTestFlight) { - return 9005; - } else { - return 9005; - } + case BusinessEnum.ServerType.Out_B2B: + return "https://demo.online-bj.com"; + case BusinessEnum.ServerType.Internal_release: + return "https://demo.online-bj.com"; - case BusinessEnum.ServerType.Out_B2B: - return 9005; - case BusinessEnum.ServerType.Internal_release: - return 9005; + case BusinessEnum.ServerType.Internal_Dev: + return "http://220.134.195.1"; - case BusinessEnum.ServerType.Internal_Dev: - return 19005; + case BusinessEnum.ServerType.QA: + return "https://qa.online-bj.com"; - default: - console.warn("GePortNum Uncheck ServerType."); - return 9005; - } - } - public static GetDownloadUrl(type: BusinessEnum.ServerType): string { - switch (type) { - case BusinessEnum.ServerType.Internal_Dev: - return "http://static-dev.online-bj.com/"; - default: - let url: string = this.GetHostUrl(type); - url = url.replace("http://", ""); - url = url.replace("https://", ""); - return "https://static-" + url; - } - } + case BusinessEnum.ServerType.Test: + return "https://bot.online-bj.com"; - public static GetUploadUrl(type: BusinessEnum.ServerType): string { - let port: string = ":9080"; - switch (type) { - case BusinessEnum.ServerType.Internal_Dev: - return "http://static-dev.online-bj.com" + port; - default: - return this.GetHostUrl(type) + port; - } - } - // ======================================================================================= + default: + console.warn("GetHostUrl Uncheck ServerType."); + // 只有內網可憐IP + return "app.casino.catan.com.tw"; + } + } + /** + * 取得伺服器連接端口 + * @param type 執行環境 + * @returns + */ + public static GetPortNum(type: BusinessEnum.ServerType): number { + if (this.UseServerTpye === BusinessEnum.ServerType.Web) { + // 網頁版測試專用.正式接網頁參數 + return 9005; + } + switch (type) { + case BusinessEnum.ServerType.Out: + return 9005; + case BusinessEnum.ServerType.Submit: + return 9005; + + case BusinessEnum.ServerType.Out_B2B: + return 9005; + case BusinessEnum.ServerType.Internal_release: + return 9005; + + case BusinessEnum.ServerType.Internal_Dev: + return 19005; + + case BusinessEnum.ServerType.QA: + return 9005; + + case BusinessEnum.ServerType.Test: + return 9005; + + default: + console.warn("GePortNum Uncheck ServerType."); + return 9005; + } + } + public static GetDownloadUrl(type: BusinessEnum.ServerType): string { + switch (type) { + case BusinessEnum.ServerType.Internal_Dev: + return "http://static-dev.online-bj.com/"; + default: + let url: string = this.GetHostUrl(type); + url = url.replace("http://", ""); + url = url.replace("https://", ""); + return "https://static-" + url; + } + } + + public static GetUploadUrl(type: BusinessEnum.ServerType): string { + let port: string = ":9080"; + switch (type) { + case BusinessEnum.ServerType.Internal_Dev: + return "http://static-dev.online-bj.com" + port; + default: + return this.GetHostUrl(type) + port; + } + } + // ======================================================================================= } \ No newline at end of file diff --git a/src/script/Common/Game/Base/Slot.ts b/src/script/Common/Game/Base/Slot.ts index 346f958..73491ff 100644 --- a/src/script/Common/Game/Base/Slot.ts +++ b/src/script/Common/Game/Base/Slot.ts @@ -1,10 +1,12 @@ export * from "../Slot1"; export * from "../Slot1201"; +export * from "../Slot1305"; export * from "../Slot32"; export * from "../Slot34"; export * from "../Slot48"; export * from "../Slot50"; export * from "../Slot62"; export * from "../Slot64"; +export * from "../Slot65"; export * from "../Slot66"; export * from "./SlotBase"; diff --git a/src/script/Common/Game/Base/SlotBase.ts b/src/script/Common/Game/Base/SlotBase.ts index e5eb9d5..dd9c2c1 100644 --- a/src/script/Common/Game/Base/SlotBase.ts +++ b/src/script/Common/Game/Base/SlotBase.ts @@ -95,7 +95,10 @@ export class SlotBase { if (this._bj_Slot.IsCountStop.value && this._bj_Slot.CountStop.value === 0) { this._bj_Slot.OnclickStop(); } - this._bj_Casino_Bot.AddLog(`Slot${this.ID} Spin Bet: ${this._bj_Slot.NowBet}, Money: ${money}${winMoneyLog}${freeLog}`); + if (ratio > 100) { + this._bj_Casino_Bot.AddLog(`Slot${this.ID} Spin Bet: ${this._bj_Slot.NowBet}, Ratio: ${ratio}, Money: ${money}${winMoneyLog}${freeLog}`); + } + // this._bj_Casino_Bot.AddLog(`Slot${this.ID} Spin Bet: ${this._bj_Slot.NowBet}, Money: ${money}${winMoneyLog}${freeLog}`); } public async FreeSpin(freeCount: number): Promise { @@ -122,7 +125,7 @@ export class SlotBase { } else { CSMessage.NetError(resp.Method, resp.Status); } - this._bj_Casino_Bot.AddLog(`Slot${this.ID} FreeSpin MaxCount: ${freeCount}, Count: ${i + 1}`); + // this._bj_Casino_Bot.AddLog(`Slot${this.ID} FreeSpin MaxCount: ${freeCount}, Count: ${i + 1}`); } return [freeCount, fswinMoney, fsmoney]; } diff --git a/src/script/Common/Game/Slot1305.ts b/src/script/Common/Game/Slot1305.ts new file mode 100644 index 0000000..86fecce --- /dev/null +++ b/src/script/Common/Game/Slot1305.ts @@ -0,0 +1,13 @@ +import SlotBase from "./Base/SlotBase"; + + +export class Slot1305 extends SlotBase { + //#region public + + public get ID(): number { return 1305; } + public get HasRetriggerFreeSpin(): boolean { return true; } + + //#endregion +} + +export default Slot1305; \ No newline at end of file diff --git a/src/script/Common/Game/Slot65.ts b/src/script/Common/Game/Slot65.ts new file mode 100644 index 0000000..20c7418 --- /dev/null +++ b/src/script/Common/Game/Slot65.ts @@ -0,0 +1,13 @@ +import SlotBase from "./Base/SlotBase"; + + +export class Slot65 extends SlotBase { + //#region public + + public get ID(): number { return 65; } + public get HasRetriggerFreeSpin(): boolean { return true; } + + //#endregion +} + +export default Slot65; \ No newline at end of file