Skip to content

Commit 07de797

Browse files
authored
bug fix (#37)
* added RSA regist function * v0.2.7 * 0.2.8 bug fix
1 parent 67e0416 commit 07de797

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

GenshinFishing.ahk

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; #Warn ; Enable warnings to assist with detecting common errors.
33
SendMode Input ; Recommended for new scripts due to its superior speed and reliability.
44
SetWorkingDir %A_ScriptDir% ; Ensures a consistent starting directory.
5-
#SingleInstance, ignore
5+
#SingleInstance, force
66
#Persistent
77
SetBatchLines, -1
88

@@ -21,20 +21,18 @@ supported_resolutions:="
2121
update_log:="
2222
(
2323

24-
> 新增 1440x900 分辨率支持
25-
> Added 1440x900 resolution support
26-
> 添加了对于更靠近中心的UI位置的支持
27-
> Added support for UI positions which is closer to center
28-
> 进一步优化了图像的搜索效率
29-
> Further optimized image search efficiency
30-
> 增加了RSA注册码鉴定
31-
> Added registration function
24+
> 新增了软件开始正常工作的提示
25+
> Added a prompt for the software to start working properly
26+
> 修复了一个导致注册用户无法正常使用的问题((*^_^*)
27+
> Fixed an issue that caused registered users to not be able to use it properly ((*^_^*))
3228

3329
)"
3430
35-
version:="0.2.7"
31+
version:="0.2.8"
32+
3633
isCNServer:=0
3734
; 出现了一个国际服玩家UI位置与国服不一致的情况。尚不能确定是服务器间差异或是其他的客户端差异所造成。暂时先令所有的图标搜索范围均扩大。
35+
isWorking:=False
3836

3937
;@Ahk2Exe-IgnoreBegin
4038
if A_Args.Length() > 0
@@ -288,6 +286,7 @@ if(!genshin_hwnd){
288286
Return
289287
}
290288
if(WinExist("A") != genshin_hwnd) {
289+
isWorking:=False
291290
SetTimer, main, -500
292291
Return
293292
}
@@ -330,7 +329,12 @@ if(!isResolutionValid) {
330329
tt("Unsupported resolution`n不支持的分辨率`n" winW "x" winH "`n`nThe supported resolutions are as follows`n支持的分辨率如下`n" supported_resolutions)
331330
SetTimer, main, -800
332331
Return
332+
} else {
333+
if(isWorking==False) {
334+
tt("Genshin Fishing Automata is working`n自动钓鱼人偶正常工作中")
335+
}
333336
}
337+
isWorking:=True
334338

335339
if(statePredict=="unknown" || statePredict=="ready") {
336340
Gosub, getState

notice.ahk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ if(!g_regist) {
4242

4343
Gui, show, w740
4444
SetTimer, notice_cd, 1000
45+
Return
4546
} else {
4647
ttm("自动钓鱼人偶注册版已启动!`n感谢您的注册!`n`nGenshin Fishing Automata registed version is up!`nThank you for registering!", 1500)
48+
goto notice_end
4749
}
48-
Return
50+
4951

5052
copymac:
5153
Clipboard:=mac_addr
@@ -75,3 +77,4 @@ if(A_GuiControl!="btn" onetwothree)
7577
}
7678
Gui, Hide
7779

80+
notice_end:

0 commit comments

Comments
 (0)