diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 161d11d5..813a2564 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -42,7 +42,7 @@ - + diff --git a/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMap.cs b/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMap.cs index 6d3a3a71..50538d6f 100644 --- a/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMap.cs +++ b/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMap.cs @@ -15,15 +15,15 @@ public class TeyvatMap : SceneBaseMap { #region 每次地图扩大都要更新的参数 - static readonly int GameMapRows = 13; // 游戏坐标下地图块的行数 - static readonly int GameMapCols = 22; // 游戏坐标下地图块的列数 - static readonly int GameMapUpRows = 5; // 游戏坐标下 左上角离地图原点的行数(注意原点在块的右下角) - static readonly int GameMapLeftCols = 15; // 游戏坐标下 左上角离地图原点的列数(注意原点在块的右下角) + public static readonly int GameMapRows = 13; // 游戏坐标下地图块的行数 + public static readonly int GameMapCols = 22; // 游戏坐标下地图块的列数 + public static readonly int GameMapUpRows = 5; // 游戏坐标下 左上角离地图原点的行数(注意原点在块的右下角) + public static readonly int GameMapLeftCols = 15; // 游戏坐标下 左上角离地图原点的列数(注意原点在块的右下角) #endregion 每次地图扩大都要更新的参数 - static readonly int TeyvatMapImageBlockWidth = 2048; + public static readonly int TeyvatMapImageBlockWidth = 2048; private readonly BaseMapLayer _teyvat256MapLayer; diff --git a/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMapTest.cs b/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMapTest.cs index 5d65c8db..d68b0932 100644 --- a/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMapTest.cs +++ b/BetterGenshinImpact/GameTask/Common/Map/Maps/TeyvatMapTest.cs @@ -15,13 +15,13 @@ public class TeyvatMapTest : SceneBaseMapByTemplateMatch { #region 每次地图扩大都要更新的参数 - static readonly int GameMapRows = 13; // 游戏坐标下地图块的行数 - static readonly int GameMapCols = 18; // 游戏坐标下地图块的列数 - static readonly int GameMapUpRows = 5; // 游戏坐标下 左上角离地图原点的行数(注意原点在块的右下角) - static readonly int GameMapLeftCols = 11; // 游戏坐标下 左上角离地图原点的列数(注意原点在块的右下角) + static readonly int GameMapRows = TeyvatMap.GameMapRows; // 游戏坐标下地图块的行数 + static readonly int GameMapCols = TeyvatMap.GameMapCols; // 游戏坐标下地图块的列数 + static readonly int GameMapUpRows = TeyvatMap.GameMapUpRows; // 游戏坐标下 左上角离地图原点的行数(注意原点在块的右下角) + static readonly int GameMapLeftCols = TeyvatMap.GameMapLeftCols; // 游戏坐标下 左上角离地图原点的列数(注意原点在块的右下角) #endregion 每次地图扩大都要更新的参数 - static readonly int TeyvatMapImageBlockWidth = 2048; + static readonly int TeyvatMapImageBlockWidth = TeyvatMap.TeyvatMapImageBlockWidth; private readonly BaseMapLayer _teyvat256MapLayer; diff --git a/BetterGenshinImpact/Core/Recognition/OpenCv/FeatureMatch/FeatureMatcher.cs b/Test/BetterGenshinImpact.Test/Simple/FeatureMatcher.cs similarity index 100% rename from BetterGenshinImpact/Core/Recognition/OpenCv/FeatureMatch/FeatureMatcher.cs rename to Test/BetterGenshinImpact.Test/Simple/FeatureMatcher.cs diff --git a/BetterGenshinImpact/GameTask/Common/Map/TeyvatMapCoordinate.cs b/Test/BetterGenshinImpact.Test/Simple/TeyvatMapCoordinate.cs similarity index 100% rename from BetterGenshinImpact/GameTask/Common/Map/TeyvatMapCoordinate.cs rename to Test/BetterGenshinImpact.Test/Simple/TeyvatMapCoordinate.cs