-
Notifications
You must be signed in to change notification settings - Fork 68
fix: stuck on splash page #540
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
alfredoheights
wants to merge
1
commit into
r2-studio:master
Choose a base branch
from
alfredoheights:alfredoheights-2024-08-22-splash-page-unknown
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,9 +37,11 @@ function log() { | |
sleep(10); | ||
var args = []; | ||
if (ts !== undefined && ts.showHeartLog && ts.record && ts.record['hearts_count']) { | ||
var msg = ""; | ||
msg += "R:"+ts.record['hearts_count'].receivedCount+" "; | ||
msg += "S:"+ts.record['hearts_count'].sentCount; | ||
var msg = "C"; | ||
// msg += "R:"+ts.record['hearts_count'].receivedCount+" "; | ||
// msg += "S:"+ts.record['hearts_count'].sentCount; | ||
// add timestamp in HH:MM:SS | ||
msg += new Date().toTimeString().split(' ')[0]; | ||
if (gTaskController !== undefined && gTaskController.tasks !== undefined) { | ||
var sendTask = gTaskController.tasks["sendHearts"]; | ||
if (sendTask !== undefined) { | ||
|
@@ -127,6 +129,7 @@ var Button = { | |
outSendHeartEnd3: {x: 316, y: 1224, color: {r: 55, g: 91, b: 139}}, | ||
outFriendScoreFrom: {x: 550, y: 935, color: {"a":0,"b":140,"g":93,"r":55}}, | ||
outFriendScoreTo: {x: 760, y: 935}, | ||
outSplashPageTapToStart: {x: 510, y: 1510}, | ||
skillLuke1: {x: 1000, y: 1372}, | ||
skillLuke2: {x: 830, y: 1402}, | ||
skillLuke3: {x: 670, y: 1447}, | ||
|
@@ -1516,10 +1519,12 @@ Tsum.prototype.exitUnknownPage = function() { | |
keycode('KEYCODE_DPAD_DOWN', 50); | ||
this.sleep(500); | ||
keycode('KEYCODE_ENTER', 50); | ||
this.tap(Button.gameQuestionCancel); | ||
this.tap(Button.gameQuestionCancel2); | ||
this.tap(Button.outClose); | ||
this.tap(Button.gameStop); | ||
this.tap(Button.outSplashPageTapToStart, 250); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess you checked that adding the 2nd ms parameter works as you expect, because for the CLY skill, I needed to add explicit sleep statements between taps. Just a hint - if it works for your problem this way, is's fine :-) |
||
this.tap(Button.gameQuestionCancel, 250); | ||
this.tap(Button.gameQuestionCancel2, 250); | ||
this.tap(Button.outClose, 250); | ||
this.tap(Button.gameStop, 250); | ||
this.tap(Button.outStart, 250); | ||
this.sleep(500); | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you intend to leave these changes in this pull request, or did you change the message just for local debugging? If intended, feel free to delete the old counting parts instead of commenting them out.
I'm not sure if anyone might be unhappy about this change. It is an easy way to check own stats without explicit tracking and creating reports, but timestamps on the other hand are indeed much more helpful if there is need for troubleshooting.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, forgot to take this out, thanks. Will do that.
I think it might be useful to have this as an option (like the debug logs) but that should be its own pull request if so.