From b950a826e7e03f8651ce8387bb7d94d664b18741 Mon Sep 17 00:00:00 2001 From: Yoshino Date: Wed, 29 May 2024 12:37:05 +0800 Subject: [PATCH 1/2] Fix: GET_SHIP was incorrectly identified. --- assets/cn/combat/GET_SHIP.png | Bin 5524 -> 2971 bytes module/combat/assets.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/cn/combat/GET_SHIP.png b/assets/cn/combat/GET_SHIP.png index 84c6baa155aeae96bb0faada41f566da23435749..d1e005f5047ab6a264ba11dc7faa6d04fcafd702 100644 GIT binary patch literal 2971 zcmeAS@N?(olHy`uVBq!ia0y~yUq=Iv~7$PIKaSgV1wRtOQmNwxeWvbzuyFE zVAytPAOG9cvG(iq*Pp)`eWLsX*vOgJ?%hAPt9`2e1(2RT{^ercfAnrT-(WRY1PS>0 zAMZH+M)b|mDYif(614Yz|7zfSi#>h;uvxVN?2v#a1~vwU1uP(^IB+rnn`sR~ECxWu xsvsvZc!3{bxHsL delta 2901 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 diff --git a/module/combat/assets.py b/module/combat/assets.py index 0c87a970a5..76855f82fc 100644 --- a/module/combat/assets.py +++ b/module/combat/assets.py @@ -33,7 +33,7 @@ GET_ITEMS_2 = Button(area={'cn': (538, 146, 742, 182), 'en': (549, 140, 740, 176), 'jp': (536, 146, 741, 182), 'tw': (538, 148, 741, 182)}, color={'cn': (160, 192, 248), 'en': (152, 185, 236), 'jp': (145, 182, 249), 'tw': (155, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_2.png', 'en': './assets/en/combat/GET_ITEMS_2.png', 'jp': './assets/jp/combat/GET_ITEMS_2.png', 'tw': './assets/tw/combat/GET_ITEMS_2.png'}) GET_ITEMS_3 = Button(area={'cn': (539, 143, 742, 179), 'en': (548, 136, 740, 172), 'jp': (540, 143, 742, 179), 'tw': (546, 145, 742, 178)}, color={'cn': (161, 193, 248), 'en': (152, 185, 237), 'jp': (145, 182, 248), 'tw': (156, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_3.png', 'en': './assets/en/combat/GET_ITEMS_3.png', 'jp': './assets/jp/combat/GET_ITEMS_3.png', 'tw': './assets/tw/combat/GET_ITEMS_3.png'}) GET_ITEMS_3_CHECK = Button(area={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, color={'cn': (84, 95, 109), 'en': (84, 95, 109), 'jp': (84, 95, 109), 'tw': (84, 95, 109)}, button={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, file={'cn': './assets/cn/combat/GET_ITEMS_3_CHECK.png', 'en': './assets/en/combat/GET_ITEMS_3_CHECK.png', 'jp': './assets/jp/combat/GET_ITEMS_3_CHECK.png', 'tw': './assets/tw/combat/GET_ITEMS_3_CHECK.png'}) -GET_SHIP = Button(area={'cn': (1104, 610, 1110, 630), 'en': (1104, 610, 1110, 630), 'jp': (1104, 610, 1110, 630), 'tw': (1104, 610, 1110, 630)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_SHIP.png', 'en': './assets/en/combat/GET_SHIP.png', 'jp': './assets/jp/combat/GET_SHIP.png', 'tw': './assets/tw/combat/GET_SHIP.png'}) +GET_SHIP = Button(area={'cn': (1104, 600, 1107, 630), 'en': (1104, 610, 1110, 630), 'jp': (1104, 610, 1110, 630), 'tw': (1104, 610, 1110, 630)}, color={'cn': (236, 235, 238), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_SHIP.png', 'en': './assets/en/combat/GET_SHIP.png', 'jp': './assets/jp/combat/GET_SHIP.png', 'tw': './assets/tw/combat/GET_SHIP.png'}) LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680), 'jp': (33, 676, 1247, 680), 'tw': (33, 676, 1247, 680)}, color={'cn': (172, 205, 232), 'en': (172, 205, 232), 'jp': (172, 205, 232), 'tw': (172, 205, 232)}, button={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680), 'jp': (33, 676, 1247, 680), 'tw': (33, 676, 1247, 680)}, file={'cn': './assets/cn/combat/LOADING_BAR.png', 'en': './assets/en/combat/LOADING_BAR.png', 'jp': './assets/jp/combat/LOADING_BAR.png', 'tw': './assets/tw/combat/LOADING_BAR.png'}) MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'}) MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'}) From d977f8b0e136bd33506d53059d0d7456fbeddcde Mon Sep 17 00:00:00 2001 From: Yoshino Date: Wed, 29 May 2024 12:40:46 +0800 Subject: [PATCH 2/2] Fix: [EN][JP][TW] GET_SHIP was incorrectly identified. --- assets/en/combat/GET_SHIP.png | Bin 5524 -> 2971 bytes assets/jp/combat/GET_SHIP.png | Bin 5524 -> 2971 bytes assets/tw/combat/GET_SHIP.png | Bin 5524 -> 2971 bytes module/combat/assets.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/en/combat/GET_SHIP.png b/assets/en/combat/GET_SHIP.png index 84c6baa155aeae96bb0faada41f566da23435749..d1e005f5047ab6a264ba11dc7faa6d04fcafd702 100644 GIT binary patch literal 2971 zcmeAS@N?(olHy`uVBq!ia0y~yUq=Iv~7$PIKaSgV1wRtOQmNwxeWvbzuyFE zVAytPAOG9cvG(iq*Pp)`eWLsX*vOgJ?%hAPt9`2e1(2RT{^ercfAnrT-(WRY1PS>0 zAMZH+M)b|mDYif(614Yz|7zfSi#>h;uvxVN?2v#a1~vwU1uP(^IB+rnn`sR~ECxWu xsvsvZc!3{bxHsL delta 2901 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 diff --git a/assets/jp/combat/GET_SHIP.png b/assets/jp/combat/GET_SHIP.png index 84c6baa155aeae96bb0faada41f566da23435749..d1e005f5047ab6a264ba11dc7faa6d04fcafd702 100644 GIT binary patch literal 2971 zcmeAS@N?(olHy`uVBq!ia0y~yUq=Iv~7$PIKaSgV1wRtOQmNwxeWvbzuyFE zVAytPAOG9cvG(iq*Pp)`eWLsX*vOgJ?%hAPt9`2e1(2RT{^ercfAnrT-(WRY1PS>0 zAMZH+M)b|mDYif(614Yz|7zfSi#>h;uvxVN?2v#a1~vwU1uP(^IB+rnn`sR~ECxWu xsvsvZc!3{bxHsL delta 2901 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 diff --git a/assets/tw/combat/GET_SHIP.png b/assets/tw/combat/GET_SHIP.png index 84c6baa155aeae96bb0faada41f566da23435749..d1e005f5047ab6a264ba11dc7faa6d04fcafd702 100644 GIT binary patch literal 2971 zcmeAS@N?(olHy`uVBq!ia0y~yUq=Iv~7$PIKaSgV1wRtOQmNwxeWvbzuyFE zVAytPAOG9cvG(iq*Pp)`eWLsX*vOgJ?%hAPt9`2e1(2RT{^ercfAnrT-(WRY1PS>0 zAMZH+M)b|mDYif(614Yz|7zfSi#>h;uvxVN?2v#a1~vwU1uP(^IB+rnn`sR~ECxWu xsvsvZc!3{bxHsL delta 2901 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 diff --git a/module/combat/assets.py b/module/combat/assets.py index 76855f82fc..a2df2683ba 100644 --- a/module/combat/assets.py +++ b/module/combat/assets.py @@ -33,7 +33,7 @@ GET_ITEMS_2 = Button(area={'cn': (538, 146, 742, 182), 'en': (549, 140, 740, 176), 'jp': (536, 146, 741, 182), 'tw': (538, 148, 741, 182)}, color={'cn': (160, 192, 248), 'en': (152, 185, 236), 'jp': (145, 182, 249), 'tw': (155, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_2.png', 'en': './assets/en/combat/GET_ITEMS_2.png', 'jp': './assets/jp/combat/GET_ITEMS_2.png', 'tw': './assets/tw/combat/GET_ITEMS_2.png'}) GET_ITEMS_3 = Button(area={'cn': (539, 143, 742, 179), 'en': (548, 136, 740, 172), 'jp': (540, 143, 742, 179), 'tw': (546, 145, 742, 178)}, color={'cn': (161, 193, 248), 'en': (152, 185, 237), 'jp': (145, 182, 248), 'tw': (156, 190, 248)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_ITEMS_3.png', 'en': './assets/en/combat/GET_ITEMS_3.png', 'jp': './assets/jp/combat/GET_ITEMS_3.png', 'tw': './assets/tw/combat/GET_ITEMS_3.png'}) GET_ITEMS_3_CHECK = Button(area={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, color={'cn': (84, 95, 109), 'en': (84, 95, 109), 'jp': (84, 95, 109), 'tw': (84, 95, 109)}, button={'cn': (335, 184, 947, 203), 'en': (335, 184, 947, 203), 'jp': (335, 184, 947, 203), 'tw': (335, 184, 947, 203)}, file={'cn': './assets/cn/combat/GET_ITEMS_3_CHECK.png', 'en': './assets/en/combat/GET_ITEMS_3_CHECK.png', 'jp': './assets/jp/combat/GET_ITEMS_3_CHECK.png', 'tw': './assets/tw/combat/GET_ITEMS_3_CHECK.png'}) -GET_SHIP = Button(area={'cn': (1104, 600, 1107, 630), 'en': (1104, 610, 1110, 630), 'jp': (1104, 610, 1110, 630), 'tw': (1104, 610, 1110, 630)}, color={'cn': (236, 235, 238), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_SHIP.png', 'en': './assets/en/combat/GET_SHIP.png', 'jp': './assets/jp/combat/GET_SHIP.png', 'tw': './assets/tw/combat/GET_SHIP.png'}) +GET_SHIP = Button(area={'cn': (1104, 600, 1107, 630), 'en': (1104, 600, 1107, 630), 'jp': (1104, 600, 1107, 630), 'tw': (1104, 600, 1107, 630)}, color={'cn': (236, 235, 238), 'en': (236, 235, 238), 'jp': (236, 235, 238), 'tw': (236, 235, 238)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/GET_SHIP.png', 'en': './assets/en/combat/GET_SHIP.png', 'jp': './assets/jp/combat/GET_SHIP.png', 'tw': './assets/tw/combat/GET_SHIP.png'}) LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680), 'jp': (33, 676, 1247, 680), 'tw': (33, 676, 1247, 680)}, color={'cn': (172, 205, 232), 'en': (172, 205, 232), 'jp': (172, 205, 232), 'tw': (172, 205, 232)}, button={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680), 'jp': (33, 676, 1247, 680), 'tw': (33, 676, 1247, 680)}, file={'cn': './assets/cn/combat/LOADING_BAR.png', 'en': './assets/en/combat/LOADING_BAR.png', 'jp': './assets/jp/combat/LOADING_BAR.png', 'tw': './assets/tw/combat/LOADING_BAR.png'}) MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'}) MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'})