Skip to content

Commit

Permalink
Merge pull request #473 from MengNianxiaoyao/mydev
Browse files Browse the repository at this point in the history
[pull] maindev from mydev
  • Loading branch information
pull[bot] authored Dec 23, 2023
2 parents ad173f7 + b14b0cf commit 0b616a6
Show file tree
Hide file tree
Showing 81 changed files with 1,028 additions and 10 deletions.
Binary file added assets/cn/dorm/DORM_FURNITURE_BUY_ALL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_BUY_CONFIRM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_BUY_SET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_COUNTDOWN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_DETAILS_ENTER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_DETAILS_QUIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_SHOP_ENTER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_SHOP_FIRST.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_FURNITURE_SHOP_QUIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/DORM_MANAGE_CHECK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/OCR_DORM_FURNITURE_COIN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/dorm/OCR_DORM_FURNITURE_PRICE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/template/TEMPLATE_SIREN_Sirenboss10.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_BUY_ALL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_BUY_CONFIRM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_BUY_SET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_COUNTDOWN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_DETAILS_ENTER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_DETAILS_QUIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_SHOP_ENTER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_SHOP_FIRST.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_FURNITURE_SHOP_QUIT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/en/dorm/DORM_MANAGE_CHECK.png
Binary file added assets/en/dorm/OCR_DORM_FURNITURE_COIN.png
Binary file added assets/en/dorm/OCR_DORM_FURNITURE_PRICE.png
Binary file added assets/en/template/TEMPLATE_SIREN_Sirenboss10.gif
Binary file added assets/jp/dorm/DORM_FURNITURE_BUY_ALL.png
Binary file added assets/jp/dorm/DORM_FURNITURE_BUY_CONFIRM.png
Binary file added assets/jp/dorm/DORM_FURNITURE_BUY_SET.png
Binary file added assets/jp/dorm/DORM_FURNITURE_COUNTDOWN.png
Binary file added assets/jp/dorm/DORM_FURNITURE_DETAILS_ENTER.png
Binary file added assets/jp/dorm/DORM_FURNITURE_DETAILS_QUIT.png
Binary file added assets/jp/dorm/DORM_FURNITURE_SHOP_ENTER.png
Binary file added assets/jp/dorm/DORM_FURNITURE_SHOP_FIRST.png
Binary file added assets/jp/dorm/DORM_FURNITURE_SHOP_QUIT.png
Binary file added assets/jp/dorm/DORM_MANAGE_CHECK.png
Binary file added assets/jp/dorm/OCR_DORM_FURNITURE_COIN.png
Binary file added assets/jp/dorm/OCR_DORM_FURNITURE_PRICE.png
Binary file added assets/jp/template/TEMPLATE_SIREN_Sirenboss10.gif
Binary file added assets/tw/dorm/DORM_FURNITURE_BUY_ALL.png
Binary file added assets/tw/dorm/DORM_FURNITURE_BUY_CONFIRM.png
Binary file added assets/tw/dorm/DORM_FURNITURE_BUY_SET.png
Binary file added assets/tw/dorm/DORM_FURNITURE_COUNTDOWN.png
Binary file added assets/tw/dorm/DORM_FURNITURE_DETAILS_ENTER.png
Binary file added assets/tw/dorm/DORM_FURNITURE_DETAILS_QUIT.png
Binary file added assets/tw/dorm/DORM_FURNITURE_SHOP_ENTER.png
Binary file added assets/tw/dorm/DORM_FURNITURE_SHOP_FIRST.png
Binary file added assets/tw/dorm/DORM_FURNITURE_SHOP_QUIT.png
Binary file added assets/tw/dorm/DORM_MANAGE_CHECK.png
Binary file added assets/tw/dorm/OCR_DORM_FURNITURE_COIN.png
Binary file added assets/tw/dorm/OCR_DORM_FURNITURE_PRICE.png
Binary file added assets/tw/template/TEMPLATE_SIREN_Sirenboss10.gif
89 changes: 89 additions & 0 deletions campaign/event_20231221_cn/b1.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger

MAP = CampaignMap('B1')
MAP.shape = 'I7'
MAP.camera_data = ['D4', 'D5', 'F4', 'F5']
MAP.camera_data_spawn_point = ['D3']
MAP.map_data = """
-- ++ ++ ++ -- ME -- -- --
-- -- MS -- Me -- ME ME ++
SP -- __ MS -- -- -- -- ME
SP -- -- MS ++ ++ ME -- ME
-- -- ++ -- Me ++ -- -- ++
ME -- Me -- -- Me -- Me ++
-- ME ++ ME -- ME -- -- MB
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2, 'boss': 1},
{'battle': 5, 'enemy': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
= MAP.flatten()


class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = True
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 17),
'width': (0.9, 10),
'prominence': 10,
'distance': 35,
}
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
'height': (255 - 17, 255),
'prominence': 10,
'distance': 50,
'wlen': 1000
}
HOMO_EDGE_COLOR_RANGE = (0, 17)
MAP_SWIPE_MULTIPLY = (1.193, 1.216)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.154, 1.175)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.120, 1.141)


class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'

def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True

return self.battle_default()

def battle_4(self):
return self.clear_boss()
80 changes: 80 additions & 0 deletions campaign/event_20231221_cn/b2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .b1 import Config as ConfigBase

MAP = CampaignMap('B2')
MAP.shape = 'I8'
MAP.camera_data = ['E2', 'E6', 'F2', 'F6']
MAP.camera_data_spawn_point = ['E2']
MAP.map_data = """
++ SP -- SP ++ -- -- MB --
-- -- -- -- -- -- ME -- ME
-- -- MS -- ++ ++ -- -- --
++ MS -- MS ++ ++ ME ++ ME
++ -- __ -- Me ++ -- Me --
-- Me -- Me Me ++ ME -- ME
++ ME -- -- -- -- -- -- --
-- ME -- ME -- ME ++ ++ ++
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2},
{'battle': 5, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
= MAP.flatten()


class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['UDFFortress2']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = True
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SWIPE_MULTIPLY = (1.260, 1.284)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.219, 1.242)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.183, 1.205)


class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'

def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True

return self.battle_default()

def battle_5(self):
return self.fleet_boss.clear_boss()
83 changes: 83 additions & 0 deletions campaign/event_20231221_cn/b3.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .b1 import Config as ConfigBase

MAP = CampaignMap('B3')
MAP.shape = 'K9'
MAP.camera_data = ['D3', 'D6', 'H3', 'H6']
MAP.camera_data_spawn_point = ['H6', 'D6']
MAP.map_data = """
-- -- ++ ++ -- -- -- ++ ++ -- --
-- -- ++ ++ -- MB -- ++ ++ ME --
ME -- ME -- ME -- ME -- -- -- ME
-- ++ ++ -- -- -- -- -- Me ME --
-- Me ++ -- SP __ SP -- ++ ++ ++
ME -- -- -- -- -- -- -- -- Me --
-- ME Me ++ -- MS -- ++ -- ME --
-- ++ -- ++ MS Me MS ++ ME -- ++
-- -- -- -- -- -- -- -- -- -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 2},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2},
{'battle': 5, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
= MAP.flatten()


class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = ['Sirenboss10']
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = True
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SWIPE_MULTIPLY = (1.078, 1.099)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.043, 1.062)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.013, 1.031)


class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'

def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True

return self.battle_default()

def battle_5(self):
return self.fleet_boss.clear_boss()
89 changes: 89 additions & 0 deletions campaign/event_20231221_cn/d1.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
from .campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger

MAP = CampaignMap('D1')
MAP.shape = 'I7'
MAP.camera_data = ['D4', 'D5', 'F4', 'F5']
MAP.camera_data_spawn_point = ['D3']
MAP.map_data = """
-- ++ ++ ++ -- ME -- -- --
-- -- MS -- Me -- ME ME ++
SP -- __ MS -- -- -- -- ME
SP -- -- MS ++ ++ ME -- ME
-- -- ++ -- Me ++ -- -- ++
ME -- Me -- -- Me -- Me ++
-- ME ++ ME -- ME -- -- MB
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 2},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2},
{'battle': 5, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
= MAP.flatten()


class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = True
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 17),
'width': (0.9, 10),
'prominence': 10,
'distance': 35,
}
EDGE_LINES_FIND_PEAKS_PARAMETERS = {
'height': (255 - 17, 255),
'prominence': 10,
'distance': 50,
'wlen': 1000
}
HOMO_EDGE_COLOR_RANGE = (0, 17)
MAP_SWIPE_MULTIPLY = (1.193, 1.216)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.154, 1.175)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.120, 1.141)


class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'

def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True

return self.battle_default()

def battle_5(self):
return self.fleet_boss.clear_boss()
Loading

0 comments on commit 0b616a6

Please sign in to comment.