[add] 1305

src/script/BJ_Casino_BotController.ts

@@ -6,9 +6,9 @@ import MainControl, { DownloadForm } from "./Common/MainControl/MainControl";
 export class BJ_Casino_BotController {
 	//#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<string> = ref(this.Hostport[this.ServerIndedx]);
 
@@ -54,57 +54,85 @@ export class BJ_Casino_BotController {
 				break;
 			}
 
-            // 肉乾
+			// Test
 			case 2: {
+				resp["host"] = "https://bot.online-bj.com";
+				resp["port"] = "9005";
+				break;
+			}
+
+			// 肉乾9006
+			case 3: {
 				resp["host"] = "http://192.168.5.230";
 				resp["port"] = "9006";
 				break;
 			}
 
+			// 肉乾9007
+			case 4: {
+				resp["host"] = "http://192.168.5.230";
+				resp["port"] = "9007";
+				break;
+			}
+
+			// 肉乾9008
+			case 5: {
+				resp["host"] = "http://192.168.5.230";
+				resp["port"] = "9008";
+				break;
+			}
+
+			// 肉乾9009
+			case 6: {
+				resp["host"] = "http://192.168.5.230";
+				resp["port"] = "9009";
+				break;
+			}
+
 			// 賴宏
-            case 3: {
+			case 7: {
 				resp["host"] = "http://192.168.5.134";
 				resp["port"] = "9005";
 				break;
 			}
 
 			// 40
-            case 4: {
+			case 8: {
 				resp["host"] = "http://192.168.5.12";
 				resp["port"] = "9487";
 				break;
 			}
 
 			// 送審
-            case 5: {
+			case 9: {
 				resp["host"] = "https://submit.online-bj.com";
 				resp["port"] = "9005";
 				break;
 			}
 
 			// 外版
-            case 6: {
+			case 10: {
 				resp["host"] = "https://game.online-bj.com";
 				resp["port"] = "9005";
 				break;
 			}
 
 			// testing1
-            case 7: {
+			case 11: {
 				resp["host"] = "http://bj-testing1.casino.catan.com.tw";
 				resp["port"] = "9005";
 				break;
 			}
 
 			// testing2
-            case 8: {
+			case 12: {
 				resp["host"] = "http://bj-testing2.casino.catan.com.tw";
 				resp["port"] = "9005";
 				break;
 			}
 
 			// testing3
-            case 9: {
+			case 13: {
 				resp["host"] = "http://bj-testing3.casino.catan.com.tw";
 				resp["port"] = "9005";
 				break;

src/script/Base/BusinessTypeSetting.ts

@@ -15,7 +15,11 @@ export module BusinessEnum {
 		/** 內版開發(內網&4G) */
 		Internal_Dev = 5,
 		/** 外部商業DEMO(B2B) */
-        Out_B2B = 6
+		Out_B2B = 6,
+		/** QA */
+		QA = 7,
+		/** Test */
+		Test = 8
 	}
 	export enum LogoType {
 		/** 完美(目前只有WEB) */
@@ -32,7 +36,7 @@ export default class BusinessTypeSetting {
 	/** 產品商業類別字串(組合判斷用) */
 	public static readonly TYPE_BUSINESS: string = "App";
 	/** 編譯版本 */
-    public static readonly COMPILE_VERSION: string = "1.4.1";
+	public static readonly COMPILE_VERSION: string = "1.7.1";
 	/** 編譯程式碼版號 */
 	public static readonly SCRIPT_BUNLE_LIST: string[] = [
 		"FormTableScript", "CommonScript", "ElementUIScript", "LoginScript", "LobbyScript", "SlotScript"
@@ -40,7 +44,7 @@ export default class BusinessTypeSetting {
 	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",
+		"BindAconsoleount", "SettingPanel", "Shop", "Vip", "Ad",
 		"Mail", "Chat", "PlayerInfo", "Rank", "Gift",
 		"ResourceItem", "Backpack", "GettingPanel", "Activity", "Game_BottomUI_BJ"
 	];
@@ -76,7 +80,7 @@ export default class BusinessTypeSetting {
 	/** 資源伺服器網址 */
 	public static UsePatch: string = null;
 	/** 帳號 */
-    public static Account: string = null;
+	public static Aconsoleount: string = null;
 	/** 密碼 */
 	public static Password: string = null;
 
@@ -115,7 +119,7 @@ export default class BusinessTypeSetting {
 	 * @returns
 	 */
 	public static GetPatchUrl(type: BusinessEnum.ServerType): string {
-        if (this.UseServerTpye == BusinessEnum.ServerType.Web) {
+		if (this.UseServerTpye === BusinessEnum.ServerType.Web) {
 			// TYP2網頁版資源路路徑判斷
 			if (this.CheckOnServer) {
 				return "../shared/";
@@ -127,11 +131,7 @@ export default class BusinessTypeSetting {
 			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/";
-                }
 
 			case BusinessEnum.ServerType.Out_B2B:
 				return "https://patch-demo.online-bj.com/game/";
@@ -141,6 +141,12 @@ export default class BusinessTypeSetting {
 			case BusinessEnum.ServerType.Internal_Dev:
 				return "http://patch-dev.online-bj.com/";
 
+			case BusinessEnum.ServerType.QA:
+				return "https://patch-qa.online-bj.com/game/";
+
+			case BusinessEnum.ServerType.Test:
+				return "https://patch-bot.online-bj.com/game/";
+
 			default:
 				console.warn("GetPatchUrl Uncheck ServerType.");
 				return "http://patch-dev.online-bj.com/";
@@ -152,18 +158,14 @@ export default class BusinessTypeSetting {
 	 * @returns
 	 */
 	public static GetHostUrl(type: BusinessEnum.ServerType): string {
-        if (this.UseServerTpye == BusinessEnum.ServerType.Web) {
+		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.Out_B2B:
 				return "https://demo.online-bj.com";
@@ -173,6 +175,12 @@ export default class BusinessTypeSetting {
 			case BusinessEnum.ServerType.Internal_Dev:
 				return "http://220.134.195.1";
 
+			case BusinessEnum.ServerType.QA:
+				return "https://qa.online-bj.com";
+
+			case BusinessEnum.ServerType.Test:
+				return "https://bot.online-bj.com";
+
 			default:
 				console.warn("GetHostUrl Uncheck ServerType.");
 				// 只有內網可憐IP
@@ -185,7 +193,7 @@ export default class BusinessTypeSetting {
 	 * @returns
 	 */
 	public static GetPortNum(type: BusinessEnum.ServerType): number {
-        if (this.UseServerTpye == BusinessEnum.ServerType.Web) {
+		if (this.UseServerTpye === BusinessEnum.ServerType.Web) {
 			// 網頁版測試專用.正式接網頁參數
 			return 9005;
 		}
@@ -193,11 +201,7 @@ export default class BusinessTypeSetting {
 			case BusinessEnum.ServerType.Out:
 				return 9005;
 			case BusinessEnum.ServerType.Submit:
-                if (!this.IsSubmitTestFlight) {
 				return 9005;
-                } else {
-                    return 9005;
-                }
 
 			case BusinessEnum.ServerType.Out_B2B:
 				return 9005;
@@ -207,6 +211,12 @@ export default class BusinessTypeSetting {
 			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;

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";

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<number[]> {
@@ -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];
 	}

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;

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;