Merge pull request #4298 from LmeSzinc/dev

Bug fix
LmeSzinc · Oct 17, 2024 · 233462c · 233462c
2 parents 423ac12 + d4df09d
commit 233462c
Show file tree

Hide file tree

Showing 58 changed files with 186 additions and 498 deletions.
diff --git a/assets/jp/combat_ui/QUIT.png b/assets/jp/combat_ui/QUIT.png
diff --git a/campaign/Readme.md b/campaign/Readme.md
diff --git a/campaign/event_20210422_cn/sp.py b/campaign/event_20210422_cn/sp.py
diff --git a/campaign/event_20210916_cn/sp.py b/campaign/event_20210916_cn/sp.py
diff --git a/campaign/event_20211229_cn/sp.py b/campaign/event_20211229_cn/sp.py
diff --git a/campaign/event_20201012_cn/sp1.py → campaign/war_archives_20201012_cn/sp1.py b/campaign/event_20201012_cn/sp1.py → campaign/war_archives_20201012_cn/sp1.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20201012_cn/sp2.py → campaign/war_archives_20201012_cn/sp2.py b/campaign/event_20201012_cn/sp2.py → campaign/war_archives_20201012_cn/sp2.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20201012_cn/sp3.py → campaign/war_archives_20201012_cn/sp3.py b/campaign/event_20201012_cn/sp3.py → campaign/war_archives_20201012_cn/sp3.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/a1.py → campaign/war_archives_20210422_cn/a1.py b/campaign/event_20210422_cn/a1.py → campaign/war_archives_20210422_cn/a1.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/a2.py → campaign/war_archives_20210422_cn/a2.py b/campaign/event_20210422_cn/a2.py → campaign/war_archives_20210422_cn/a2.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/a3.py → campaign/war_archives_20210422_cn/a3.py b/campaign/event_20210422_cn/a3.py → campaign/war_archives_20210422_cn/a3.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/b1.py → campaign/war_archives_20210422_cn/b1.py b/campaign/event_20210422_cn/b1.py → campaign/war_archives_20210422_cn/b1.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/b2.py → campaign/war_archives_20210422_cn/b2.py b/campaign/event_20210422_cn/b2.py → campaign/war_archives_20210422_cn/b2.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

diff --git a/campaign/event_20210422_cn/b3.py → campaign/war_archives_20210422_cn/b3.py b/campaign/event_20210422_cn/b3.py → campaign/war_archives_20210422_cn/b3.py
@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids