Dev (#34)

* add related repo

* fix trayip typo

* download link added

* UI postion issue

* add 1440x900 support

* shows supported resolutions

* Further optimized image search efficiency

Author: Nigh

GenshinFishing.ahk

@@ -6,17 +6,33 @@ SetWorkingDir %A_ScriptDir%  ; Ensures a consistent starting directory.
 #Persistent
 SetBatchLines, -1
 
-update_log:="
+supported_resolutions:="
 (
+1280 x 720
+1440 x 900
+1600 x 900
+1920 x 1080
+2560 x 1080
+2560 x 1440
+3440 x 1440
+3840 x 2160
+)"
 
-> 现在更新源将会自动选择
-> The update source will now be automatically selected
-
+update_log:="
+(
 
+> 新增 1440x900 分辨率支持
+> Added 1440x900 resolution support
+> 添加了对于更靠近中心的UI位置的支持
+> Added support for UI positions which is closer to center 
+> 进一步优化了图像的搜索效率
+> Further optimized image search efficiency
 
 )"
 
-version:="0.2.5"
+version:="0.2.6"
+isCNServer:=0
+; 出现了一个国际服玩家UI位置与国服不一致的情况。尚不能确定是服务器间差异或是其他的客户端差异所造成。暂时先令所有的图标搜索范围均扩大。
 
 ;@Ahk2Exe-IgnoreBegin
 if A_Args.Length() > 0
@@ -60,7 +76,7 @@ IfExist, updater.exe
 }
 #include update.ahk
 
-TrayTip "Genshin Fishing automata Start`nv" version "`n原神钓鱼人偶启动"
+TrayTip, % "Genshin Fishing Automata", % "Genshin Fishing Automata Start`nv" version "`n原神钓鱼人偶启动"
 
 img_list:=Object("bar",Object("filename","bar.png")
 ,"casting",Object("filename","casting.png")
@@ -110,10 +126,13 @@ log(txt,level=0)
 
 genshin_window_exist()
 {
+	; global isCNServer
 	genshinHwnd := WinExist("ahk_exe GenshinImpact.exe")
+	; isCNServer := 0
 	if not genshinHwnd
 	{
 		genshinHwnd := WinExist("ahk_exe YuanShen.exe")
+		; isCNServer := 1
 	}
 	return genshinHwnd
 }
@@ -174,26 +193,60 @@ dLinePt(p)
 	return Ceil(p*dLine)
 }
 
+; iconSize = dLinePt(0.0353) * dLinePt(0.0442)
+
 getState:
+if(isCNServer) {
+	iconLeftPt := 0.167
+} else {
+	iconLeftPt := 0.222
+}
+iconTopPt := 0.084
+iconBottomPt := 0
+iconRightPt := 0
+
+if(last_iconX>0) {
+	last_iconLeftPt := (winW - last_iconX)/dLine
+	last_iconTopPt := (winH - last_iconY)/dLine
+	
+	iconBottomPt := (winH - last_iconY - dLinePt(0.0442*1.5))/dLine
+	iconRightPt := (winW - last_iconX - dLinePt(0.0353*1.5))/dLine
+	if(iconBottomPt<0){
+		iconBottomPt := 0
+	}
+	if(iconRightPt<0){
+		iconRightPt := 0
+	}
+	iconLeftPt := last_iconLeftPt + (0.0353*0.5)
+	iconTopPt := last_iconTopPt + (0.0442*0.5)
+	log("lastIcon=" last_iconX ", " last_iconY "  dLine=" dLine, 3)
+}
+; log("search from [" winW-dLinePt(iconLeftPt) ", " winH-dLinePt(iconTopPt) "] to [" winW-dLinePt(iconRightPt) ", " winH-dLinePt(iconBottomPt) "]", 3)
 ; k:=(((winW**2)+(winH**2))**0.5)/(((1920**2)+(1080**2))**0.5)
-ImageSearch, iconX, iconY, winW-dLinePt(0.167), winH-dLinePt(0.084), winW, winH, % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.ready.filename
+ImageSearch, iconX, iconY, winW-dLinePt(iconLeftPt), winH-dLinePt(iconTopPt), winW-dLinePt(iconRightPt), winH-dLinePt(iconBottomPt), % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.ready.filename
 if(!ErrorLevel){
+	last_iconX := iconX
+	last_iconY := iconY
 	state:="ready"
 	statePredict:=state
 	stateUnknownStart := 0
 	log("state->" statePredict, 1)
 	return
 }
-ImageSearch, iconX, iconY, winW-dLinePt(0.167), winH-dLinePt(0.084), winW, winH, % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.reel.filename
+ImageSearch, iconX, iconY, winW-dLinePt(iconLeftPt), winH-dLinePt(iconTopPt), winW-dLinePt(iconRightPt), winH-dLinePt(iconBottomPt), % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.reel.filename
 if(!ErrorLevel){
+	last_iconX := iconX
+	last_iconY := iconY
 	state:="reel"
 	statePredict:=state
 	stateUnknownStart := 0
 	log("state->" statePredict, 1)
 	return
 }
-ImageSearch, iconX, iconY, winW-dLinePt(0.167), winH-dLinePt(0.084), winW, winH, % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.casting.filename
+ImageSearch, iconX, iconY, winW-dLinePt(iconLeftPt), winH-dLinePt(iconTopPt), winW-dLinePt(iconRightPt), winH-dLinePt(iconBottomPt), % "*32 *TransFuchsia " A_Temp "/genshinfishing/" winW winH "/" img_list.casting.filename
 if(!ErrorLevel){
+	last_iconX := iconX
+	last_iconY := iconY
 	state:="casting"
 	statePredict:=state
 	stateUnknownStart := 0
@@ -205,6 +258,8 @@ if(stateUnknownStart == 0) {
 	stateUnknownStart := A_TickCount
 }
 if(statePredict!="unknown" && A_TickCount - stateUnknownStart>=2000){
+	last_iconX := 0
+	last_iconY := 0
 	statePredict:="unknown"
 	; Click, Up
 	log("state->" statePredict, 1)
@@ -217,13 +272,11 @@ if(!genshin_hwnd){
 	SetTimer, main, -800
 	Return
 }
-if(WinExist("A") != genshin_hwnd)
-{
+if(WinExist("A") != genshin_hwnd) {
 	SetTimer, main, -500
 	Return
 }
 getClientSize(genshin_hwnd, winW, winH)
-
 if(oldWinW!=winW || oldWinH!=winH) {
 	log("Get dimension=" winW "x" winH,1)
 	if(InStr(FileExist(A_Temp "/genshinfishing/" winW winH), "D")) {
@@ -259,13 +312,12 @@ if(oldWinW!=winW || oldWinH!=winH) {
 oldWinW:=winW
 oldWinH:=winH
 if(!isResolutionValid) {
-	tt("Unsupported resolution`n不支持的分辨率`n" winW "x" winH)
+	tt("Unsupported resolution`n不支持的分辨率`n" winW "x" winH "`n`nThe supported resolutions are as follows`n支持的分辨率如下`n" supported_resolutions)
 	SetTimer, main, -800
 	Return
 }
 
-if(statePredict=="unknown" || statePredict=="ready")
-{
+if(statePredict=="unknown" || statePredict=="ready") {
 	Gosub, getState
 	if(statePredict!="unknown" && debugmode){
 		tt("state = " state "`nstatePredict = " statePredict "`n" winW "," winH)

README.md

@@ -15,6 +15,15 @@
 - DoMiSo-Genshin(原神自动弹琴人偶): https://github.com/Nigh/DoMiSo-genshin
 - LyreMaster-Genshin(原神手搓弹琴大师): https://github.com/Nigh/LyreMaster-Genshin
 
+## Related Repo 相关项目
+- DoMiSo-Genshin(原神自动弹琴人偶): https://github.com/Nigh/DoMiSo-genshin
+- LyreMaster-Genshin(原神手搓弹琴大师): https://github.com/Nigh/LyreMaster-Genshin
+
+## Download(下载)
+
+- [GitHub Download - GitHub下载](https://github.com/Nigh/Genshin-fishing/releases/latest/download/GenshinFishing.zip)
+- [Mirror Download - 镜像下载](https://ghproxy.com/https://github.com/Nigh/Genshin-fishing/releases/latest/download/GenshinFishing.zip)
+
 ## Usage 用法用量
 解压到文件夹，直接运行exe即可。  
 Unzip it into a folder and run the exe directly.
@@ -33,9 +42,7 @@ The following image settings have been tested to work properly:
 | 2560 x 1440       | ✔            |
 | 2560 x 1080       | ✔            |
 | 1600 x 900        | ✔            |
-| 1440 x 900        | ❌            |
-| 1366 x 768        | ❌            |
-| 1360 x 768        | ❌            |
+| 1440 x 900        | ✔            |
 | 1280 x 720        | ✔            |
 
 如果需要更多的分辨率支持，请提交issue。  

assets/1440900/bar.png

@@ -8,6 +8,15 @@ FileInstall, .\assets\1280720\ready.png, % A_Temp "\genshinfishing\1280720\ready
 FileInstall, .\assets\1280720\reel.png, % A_Temp "\genshinfishing\1280720\reel.png", 1
 FileInstall, .\assets\1280720\right.png, % A_Temp "\genshinfishing\1280720\right.png", 1
 
+FileCreateDir, % A_Temp "\genshinfishing\1440900"
+FileInstall, .\assets\1440900\bar.png, % A_Temp "\genshinfishing\1440900\bar.png", 1
+FileInstall, .\assets\1440900\casting.png, % A_Temp "\genshinfishing\1440900\casting.png", 1
+FileInstall, .\assets\1440900\cur.png, % A_Temp "\genshinfishing\1440900\cur.png", 1
+FileInstall, .\assets\1440900\left.png, % A_Temp "\genshinfishing\1440900\left.png", 1
+FileInstall, .\assets\1440900\ready.png, % A_Temp "\genshinfishing\1440900\ready.png", 1
+FileInstall, .\assets\1440900\reel.png, % A_Temp "\genshinfishing\1440900\reel.png", 1
+FileInstall, .\assets\1440900\right.png, % A_Temp "\genshinfishing\1440900\right.png", 1
+
 FileCreateDir, % A_Temp "\genshinfishing\1600900"
 FileInstall, .\assets\1600900\bar.png, % A_Temp "\genshinfishing\1600900\bar.png", 1
 FileInstall, .\assets\1600900\casting.png, % A_Temp "\genshinfishing\1600900\casting.png", 1