diff --git a/script-config.json b/script-config.json index 84d9cd40..ef163606 100644 --- a/script-config.json +++ b/script-config.json @@ -82,8 +82,8 @@ "com.r2studio.TsumBeta": { "id": "com.r2studio.TsumBeta", "title": "Disney Tsum Tsum", - "versionCode": 69, - "description": "\uD83D\uDD16 版本 v69\n", + "versionCode": 70, + "description": "\uD83D\uDD16 版本 v70\n", "packageName": "com.linecorp.LGTMTMG", "downloadURL": "https://github.com/r2-studio/robotmon-scripts/raw/master/scripts/com.r2studio.TsumBeta/index.zip", "dependencies": [] diff --git a/scripts/com.r2studio.TsumBeta/BACKLOG.md b/scripts/com.r2studio.TsumBeta/BACKLOG.md new file mode 100644 index 00000000..e5832604 --- /dev/null +++ b/scripts/com.r2studio.TsumBeta/BACKLOG.md @@ -0,0 +1,12 @@ +# Backlog + +All potential changes which would improve the TsumBeta script will be documented in this file. + +### Bugs +- On some devices, after game play, rubies are spent when "Magic Time" is offered (reported by TAR). Happened on real phones without "Special screen ratio" (with video evidence) and Nox (not recorded, config details currently unknown). +- Harden auto start. Clicking the daily banners too fast or while loading can make the game stuck. + +### Features +- Add "Spam skill" option to check for skill after every finished chain instead of every chain batch. +- Skill: Jedi Luke (13 swipes technique) +- Rewrite of Settings UI (became too large as single-page, not dynamic regarding settings like "skill level" of Cinderella) diff --git a/scripts/com.r2studio.TsumBeta/CHANGELOG.md b/scripts/com.r2studio.TsumBeta/CHANGELOG.md index b0635701..d35a3cb2 100644 --- a/scripts/com.r2studio.TsumBeta/CHANGELOG.md +++ b/scripts/com.r2studio.TsumBeta/CHANGELOG.md @@ -5,7 +5,14 @@ All notable changes to the TsumBeta script will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -[//]: # (## unreleased) +## [v70] - 2024-08-16 + +### Added +- Skill: Captain Lightyear + +### Changed +- First clicks on script start do now always have pauses until the friends page is reached. This should reduce the game ending in an infinite "Loading" dialog if event notifications get clicked away too fast. This attempt is not very solid, but a better implementation will need time, so this topic stays in the backlog. +- Mail processing speed increased. This was slowed down in v62 to improve stability, but time has shown that this does not improve the game stability. ## [v69] - 2024-07-27 diff --git a/scripts/com.r2studio.TsumBeta/index.zip b/scripts/com.r2studio.TsumBeta/index.zip index ef3af2ea..80bc50cd 100644 Binary files a/scripts/com.r2studio.TsumBeta/index.zip and b/scripts/com.r2studio.TsumBeta/index.zip differ diff --git a/scripts/com.r2studio.TsumBeta/src/index.js b/scripts/com.r2studio.TsumBeta/src/index.js index cf60910f..3491fd53 100644 --- a/scripts/com.r2studio.TsumBeta/src/index.js +++ b/scripts/com.r2studio.TsumBeta/src/index.js @@ -131,6 +131,9 @@ var Button = { skillLuke2: {x: 830, y: 1402}, skillLuke3: {x: 670, y: 1447}, skillLuke4: {x: 960, y: 1232}, + skillCptLy1: {x: 670, y: 1050}, + skillCptLy2: {x: 310, y: 1050}, + skillCptLy3: {x: 540, y: 414}, outReceiveNameFromBase: {y: 532}, outReceiveNameFrom: {x: 150}, outReceiveNameToBase: {y: 670}, @@ -826,7 +829,7 @@ var Logs = { calculateScreenSize: 'Calculating screen size', offset: 'Offset (X, Y, H, W)', startTsumTsumApp: 'Start TsumTsum app', - currentPage: 'Current page', + currentPage: 'Pg:', friendsPage: 'Friends page', checkBonusItems: 'Check bonus items', receiveAllGifts: 'Receive all gifts', @@ -1159,7 +1162,7 @@ function Tsum(isJP, detect, logs) { this.debug = false; this.autoLaunch = false; this.isRunning = true; - this.isStartupPhase = false; + this.isStartupPhase = true; this.runTimes = 0; this.myTsum = ''; this.storagePath = getStoragePath(); @@ -1320,7 +1323,6 @@ Tsum.prototype.startApp = function() { return; } log(this.logs.startTsumTsumApp); - this.isStartupPhase = true; startTsumTsumApp(this.isJP); this.sleep(10000); log("TsumTsum app starting."); @@ -1941,8 +1943,21 @@ Tsum.prototype.useSkill = function(board) { } else { this.clearAllBubbles(); } - } - else { + } else if (this.skillType === 'block_cpt_ly_s'){ + this.tap(Button.gameRand, 100); + this.sleep(2100); + this.tap(Button.skillCptLy1, 10); + this.sleep(50); + this.tap(Button.skillCptLy2, 10); + this.sleep(500); + this.tap(Button.skillCptLy3, 10); + this.sleep(500); + this.tap(Button.skillCptLy3, 10); + this.sleep(550); + this.tap(Button.skillCptLy3, 10); + this.sleep(500); + this.clearAllBubbles(0, 0, 1000); + } else { this.sleep(this.skillInterval); } return true; @@ -2313,7 +2328,6 @@ Tsum.prototype.taskReceiveOneItem = function() { receivedCount++; } sender = undefined; - this.sleep(600); timeoutCounter = 0; if (this.claimAllWithoutCoins && isHeartWithoutCoins) receivedHeartWithoutCoins++; diff --git a/scripts/com.r2studio.TsumBeta/src/settings.js b/scripts/com.r2studio.TsumBeta/src/settings.js index d553727b..f28b1d68 100644 --- a/scripts/com.r2studio.TsumBeta/src/settings.js +++ b/scripts/com.r2studio.TsumBeta/src/settings.js @@ -1,6 +1,6 @@ "use strict"; -var VERSION = 69; +var VERSION = 70; /** * Returns the language parameter for the currently active locale. @@ -188,8 +188,9 @@ var settings = [ {key: 'block_snowwhite_s', title: 'Snow White', title_zh_TW: '白雪公主'}, {key: 'block_cinderella_s', title: 'Cinderella', title_zh_TW: '仙度瑞拉'}, {key: 'block_woody2_s', title: 'Sheriff Woody', title_zh_TW: '警長胡迪'}, - {key: 'block_pair_tsum', title: 'Pair Tsum', title_zh_TW: '配对Tsum'}, {key: 'block_cabbage_mickey_s', title: 'Cabbage Mickey', title_zh_TW: '卷心菜米奇'}, + {key: 'block_cpt_ly_s', title: 'Cpt. Lightyear', title_zh_TW: '光年队长'}, + {key: 'block_pair_tsum', title: 'Pair Tsum', title_zh_TW: '配对Tsum'}, {key: 'no_skill', title: 'No Skill', title_zh_TW: '没有技能'} ] },