Skip to content

EXP_INFO_B asset fix #4603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shane-Xue wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

EXP_INFO_B asset fix #4603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/cn/combat/EXP_INFO_B.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/en/combat/EXP_INFO_B.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/jp/combat/EXP_INFO_B.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/tw/combat/EXP_INFO_B.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_2_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .campaign_2_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_2_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_2_1 import Config
from .campaign_2_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_2_3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_2_1 import Config
from .campaign_2_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_2_4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_2_1 import Config as ConfigBase
from .campaign_2_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
10 changes: 0 additions & 10 deletions campaign/campaign_main/campaign_2_base.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_3_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .campaign_3_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_3_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_3_1 import Config
from .campaign_3_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
2 changes: 1 addition & 1 deletion campaign/campaign_main/campaign_3_3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_3_1 import Config as ConfigBase
from .campaign_3_base import CampaignBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down
6 changes: 3 additions & 3 deletions campaign/campaign_main/campaign_3_4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from campaign.campaign_main.campaign_3_1 import Config as Config31
from .campaign_3_base import CampaignBase
from campaign.campaign_main.campaign_3_1 import Config as ConfigBase
from module.campaign.campaign_base import CampaignBase
from module.logger import logger
from module.map.map_base import CampaignMap
from module.map.map_grids import RoadGrids, SelectedGrids
Expand Down Expand Up @@ -35,7 +35,7 @@
= MAP.flatten()


class Config(Config31):
class Config(ConfigBase):
MAP_MYSTERY_HAS_CARRIER = False

INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
Expand Down
11 changes: 0 additions & 11 deletions campaign/campaign_main/campaign_3_base.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion module/combat/assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
EMERGENCY_REPAIR_AVAILABLE = Button(area={'cn': (106, 533, 119, 540), 'en': (106, 533, 119, 540), 'jp': (106, 533, 119, 540), 'tw': (106, 533, 119, 540)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (97, 512, 141, 557), 'en': (97, 512, 141, 557), 'jp': (97, 512, 141, 557), 'tw': (97, 512, 141, 557)}, file={'cn': './assets/cn/combat/EMERGENCY_REPAIR_AVAILABLE.png', 'en': './assets/en/combat/EMERGENCY_REPAIR_AVAILABLE.png', 'jp': './assets/jp/combat/EMERGENCY_REPAIR_AVAILABLE.png', 'tw': './assets/tw/combat/EMERGENCY_REPAIR_AVAILABLE.png'})
EMERGENCY_REPAIR_CONFIRM = Button(area={'cn': (669, 418, 842, 475), 'en': (668, 417, 843, 477), 'jp': (670, 418, 841, 475), 'tw': (669, 418, 842, 475)}, color={'cn': (94, 143, 204), 'en': (90, 141, 203), 'jp': (89, 139, 200), 'tw': (94, 143, 204)}, button={'cn': (669, 418, 842, 475), 'en': (668, 417, 843, 477), 'jp': (670, 418, 841, 475), 'tw': (669, 418, 842, 475)}, file={'cn': './assets/cn/combat/EMERGENCY_REPAIR_CONFIRM.png', 'en': './assets/en/combat/EMERGENCY_REPAIR_CONFIRM.png', 'jp': './assets/jp/combat/EMERGENCY_REPAIR_CONFIRM.png', 'tw': './assets/tw/combat/EMERGENCY_REPAIR_CONFIRM.png'})
EXP_INFO_A = Button(area={'cn': (337, 90, 394, 102), 'en': (337, 90, 394, 102), 'jp': (337, 90, 394, 102), 'tw': (337, 90, 394, 102)}, color={'cn': (235, 228, 110), 'en': (235, 228, 110), 'jp': (235, 228, 110), 'tw': (235, 228, 110)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_A.png', 'en': './assets/en/combat/EXP_INFO_A.png', 'jp': './assets/jp/combat/EXP_INFO_A.png', 'tw': './assets/tw/combat/EXP_INFO_A.png'})
EXP_INFO_B = Button(area={'cn': (332, 107, 387, 118), 'en': (332, 107, 387, 118), 'jp': (332, 107, 387, 118), 'tw': (332, 107, 387, 118)}, color={'cn': (193, 238, 255), 'en': (193, 238, 255), 'jp': (193, 238, 255), 'tw': (193, 238, 255)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_B.png', 'en': './assets/en/combat/EXP_INFO_B.png', 'jp': './assets/jp/combat/EXP_INFO_B.png', 'tw': './assets/tw/combat/EXP_INFO_B.png'})
EXP_INFO_B = Button(area={'cn': (331, 74, 388, 87), 'en': (331, 74, 388, 87), 'jp': (331, 74, 388, 87), 'tw': (331, 74, 388, 87)}, color={'cn': (133, 217, 252), 'en': (133, 217, 252), 'jp': (133, 217, 252), 'tw': (133, 217, 252)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_B.png', 'en': './assets/en/combat/EXP_INFO_B.png', 'jp': './assets/jp/combat/EXP_INFO_B.png', 'tw': './assets/tw/combat/EXP_INFO_B.png'})
EXP_INFO_C = Button(area={'cn': (332, 56, 345, 107), 'en': (332, 56, 345, 107), 'jp': (332, 56, 345, 107), 'tw': (332, 56, 345, 107)}, color={'cn': (198, 208, 198), 'en': (198, 208, 198), 'jp': (198, 208, 198), 'tw': (198, 208, 198)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_C.png', 'en': './assets/en/combat/EXP_INFO_C.png', 'jp': './assets/jp/combat/EXP_INFO_C.png', 'tw': './assets/tw/combat/EXP_INFO_C.png'})
EXP_INFO_D = Button(area={'cn': (328, 45, 341, 119), 'en': (328, 45, 341, 119), 'jp': (328, 45, 341, 119), 'tw': (328, 45, 341, 119)}, color={'cn': (199, 208, 199), 'en': (199, 208, 199), 'jp': (199, 208, 199), 'tw': (199, 208, 199)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_D.png', 'en': './assets/en/combat/EXP_INFO_D.png', 'jp': './assets/jp/combat/EXP_INFO_D.png', 'tw': './assets/tw/combat/EXP_INFO_D.png'})
EXP_INFO_S = Button(area={'cn': (342, 107, 389, 119), 'en': (342, 107, 389, 119), 'jp': (342, 107, 389, 119), 'tw': (342, 107, 389, 119)}, color={'cn': (233, 242, 127), 'en': (233, 242, 127), 'jp': (233, 242, 127), 'tw': (233, 242, 127)}, button={'cn': (1133, 634, 1262, 650), 'en': (1133, 634, 1262, 650), 'jp': (1133, 634, 1262, 650), 'tw': (1133, 634, 1262, 650)}, file={'cn': './assets/cn/combat/EXP_INFO_S.png', 'en': './assets/en/combat/EXP_INFO_S.png', 'jp': './assets/jp/combat/EXP_INFO_S.png', 'tw': './assets/tw/combat/EXP_INFO_S.png'})
Expand Down