diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoons.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoons.png index d7acf7cd62..63d302e37f 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoons.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoons.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoskyPassage.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoskyPassage.png index 2e64c99659..24d165ccb8 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoskyPassage.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoskyPassage.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageCombatDps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageCombatDps.png index 1f0ab5a16f..14bd73255d 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageCombatDps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageCombatDps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageConfrontation.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageConfrontation.png index 29e863e67c..48cb9c5002 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageConfrontation.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageConfrontation.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyDps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyDps.png index 6d704159e8..a2903e309d 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyDps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyDps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyTransportation.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyTransportation.png index dc18c0614c..9f275a190d 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyTransportation.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyTransportation.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounter.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounter.png index ed5005f0a4..e2917e6c6c 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounter.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounter.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageGuidance.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageGuidance.png index 26885de174..af5c510092 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageGuidance.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageGuidance.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageProphecy.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageProphecy.png index 4a9646765d..3dde406674 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageProphecy.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageProphecy.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageSafeHouse.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageSafeHouse.png index fe3425346b..18756b45b8 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageSafeHouse.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageSafeHouse.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageTrader.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageTrader.png index eeb1508f8e..c9cdd6fb52 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageTrader.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageTrader.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageWindAndRain.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageWindAndRain.png index d44fd17f51..ad34e89f26 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageWindAndRain.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageWindAndRain.png differ diff --git a/tools/MaskRangeTool/main.py b/tools/MaskRangeTool/main.py index 9dee0c4bc5..ebb4b7ba5a 100644 --- a/tools/MaskRangeTool/main.py +++ b/tools/MaskRangeTool/main.py @@ -16,17 +16,21 @@ if __name__ == '__main__': rgb_base_mask_range_ignore_dark = [[[20, 20, 20], [255, 255, 255]]] # 忽略暗色背景 # 自动判断图片的合适 mask_ranges - # image = cv2.imread(str(maa_dir / "resource" / "template" / "Roguelike" / "JieGarden" / "JieGarden@Roguelike@StageConfrontation.png")) + # image = cv2.imread(str(maa_dir / "resource" / "template" / "Roguelike" / "JieGarden" / "JieGarden@Roguelike@StageWindAndRain.png")) # generate_mask_ranges(image, 'luv', luv_base_mask_range_ignore_light_dark) # generate_mask_ranges(image, 'hsv', hsv_base_mask_range_ignore_dark) # generate_mask_ranges(image, 'rgb', rgb_base_mask_range_ignore_dark) # 在给定的 mask_ranges 下展示一张图 - image = cv2.imread(str(maa_dir / "resource" / "template" / "MiniGame" / "AT" / "MiniGame@AT@InterestPlus3.png")) + image = cv2.imread(str(maa_dir / "resource" / "template" / "Roguelike" / "JieGarden" / "JieGarden@Roguelike@StageWindAndRain.png")) mask_ranges = [ [ - [0, 0, 0], - [60, 255, 220] + [80, 0, 50], + [90, 255, 180] + ], + [ + [0, 0, 230], + [180, 30, 255] ] ] @@ -35,12 +39,16 @@ if __name__ == '__main__': # show_image_mask(image, calc_mask_from_ranges(image, mask_ranges, 'luv', True), 'luv') # 在给定的 mask_ranges 下比较两张图 - image1 = cv2.imread(str(maa_dir / "resource" / "template" / "MiniGame" / "AT" / "MiniGame@AT@InterestPlus3.png")) - image2 = cv2.imread(str(maa_dir / "resource" / "template" / "MiniGame" / "AT" / "MiniGame@AT@InterestPlus2.png")) + image1 = cv2.imread(str(maa_dir / "resource" / "template" / "Roguelike" / "JieGarden" / "JieGarden@Roguelike@StageWindAndRain.png")) + image2 = cv2.imread(str(maa_dir / "resource" / "template" / "Roguelike" / "JieGarden" / "JieGarden@Roguelike@StageProphecy.png")) mask_ranges = [ [ - [0, 0, 0], - [60, 255, 220] + [80, 0, 50], + [90, 255, 180] + ], + [ + [0, 0, 230], + [180, 30, 255] ] ]