Skip to content

Commit 7e6fa47

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5691 from LmeSzinc/dev
Bug fix
2 parents 5efbd5e + 2c0ef62 commit 7e6fa47

12 files changed

Lines changed: 70 additions & 45 deletions

File tree

‎assets/cn/handler/MAP_AIR_STRIKE.png‎

-4.93 KB
Loading

‎assets/en/handler/MAP_AIR_STRIKE.png‎

-25.1 KB
Binary file not shown.

‎assets/jp/handler/MAP_AIR_STRIKE.png‎

-25.1 KB
Binary file not shown.

‎assets/tw/handler/MAP_AIR_STRIKE.png‎

-25.1 KB
Binary file not shown.

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,3 +296,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
296296
| 20260417 | event 20201126 cn | Vacation Lane Rerun | - | - | - | 復刻假日航線 |
297297
| 20260514 | event 20221222 cn | Parallel Superimposition | - | - | - | 復刻定向折疊 |
298298
| 20260520 | event 20260520 cn | Alliance Before the Hagiobull | 圣印前的同盟 | Alliance Before the Hagiobull | 聖印前の同盟 | - |
299+
| 20260528 | event 20220818 cn | Operation Convergence | - | - | - | 復刻遠匯點作戰 |

‎module/config/argument/args.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@
16421642
"type": "select",
16431643
"value": "campaign_main",
16441644
"option": [
1645-
"event_20221222_cn",
1645+
"event_20220818_cn",
16461646
"event_20260520_cn"
16471647
],
16481648
"option_cn": [
@@ -1655,10 +1655,10 @@
16551655
"event_20260520_cn"
16561656
],
16571657
"option_tw": [
1658-
"event_20221222_cn"
1658+
"event_20220818_cn"
16591659
],
16601660
"option_bold": [
1661-
"event_20221222_cn",
1661+
"event_20220818_cn",
16621662
"event_20260520_cn"
16631663
]
16641664
},
@@ -1924,7 +1924,7 @@
19241924
"type": "select",
19251925
"value": "campaign_main",
19261926
"option": [
1927-
"event_20221222_cn",
1927+
"event_20220818_cn",
19281928
"event_20260520_cn"
19291929
],
19301930
"option_cn": [
@@ -1937,10 +1937,10 @@
19371937
"event_20260520_cn"
19381938
],
19391939
"option_tw": [
1940-
"event_20221222_cn"
1940+
"event_20220818_cn"
19411941
],
19421942
"option_bold": [
1943-
"event_20221222_cn",
1943+
"event_20220818_cn",
19441944
"event_20260520_cn"
19451945
]
19461946
},
@@ -2321,7 +2321,7 @@
23212321
"type": "select",
23222322
"value": "campaign_main",
23232323
"option": [
2324-
"event_20221222_cn",
2324+
"event_20220818_cn",
23252325
"event_20260520_cn"
23262326
],
23272327
"option_cn": [
@@ -2334,10 +2334,10 @@
23342334
"event_20260520_cn"
23352335
],
23362336
"option_tw": [
2337-
"event_20221222_cn"
2337+
"event_20220818_cn"
23382338
],
23392339
"option_bold": [
2340-
"event_20221222_cn",
2340+
"event_20220818_cn",
23412341
"event_20260520_cn"
23422342
]
23432343
},
@@ -4058,7 +4058,7 @@
40584058
"type": "select",
40594059
"value": "campaign_main",
40604060
"option": [
4061-
"event_20221222_cn",
4061+
"event_20220818_cn",
40624062
"event_20260520_cn"
40634063
],
40644064
"option_cn": [
@@ -4071,10 +4071,10 @@
40714071
"event_20260520_cn"
40724072
],
40734073
"option_tw": [
4074-
"event_20221222_cn"
4074+
"event_20220818_cn"
40754075
],
40764076
"option_bold": [
4077-
"event_20221222_cn",
4077+
"event_20220818_cn",
40784078
"event_20260520_cn"
40794079
]
40804080
},
@@ -4472,7 +4472,7 @@
44724472
"type": "select",
44734473
"value": "campaign_main",
44744474
"option": [
4475-
"event_20221222_cn",
4475+
"event_20220818_cn",
44764476
"event_20260520_cn"
44774477
],
44784478
"option_cn": [
@@ -4485,10 +4485,10 @@
44854485
"event_20260520_cn"
44864486
],
44874487
"option_tw": [
4488-
"event_20221222_cn"
4488+
"event_20220818_cn"
44894489
],
44904490
"option_bold": [
4491-
"event_20221222_cn",
4491+
"event_20220818_cn",
44924492
"event_20260520_cn"
44934493
]
44944494
},
@@ -4886,7 +4886,7 @@
48864886
"type": "select",
48874887
"value": "campaign_main",
48884888
"option": [
4889-
"event_20221222_cn",
4889+
"event_20220818_cn",
48904890
"event_20260520_cn"
48914891
],
48924892
"option_cn": [
@@ -4899,10 +4899,10 @@
48994899
"event_20260520_cn"
49004900
],
49014901
"option_tw": [
4902-
"event_20221222_cn"
4902+
"event_20220818_cn"
49034903
],
49044904
"option_bold": [
4905-
"event_20221222_cn",
4905+
"event_20220818_cn",
49064906
"event_20260520_cn"
49074907
]
49084908
},
@@ -5300,7 +5300,7 @@
53005300
"type": "select",
53015301
"value": "campaign_main",
53025302
"option": [
5303-
"event_20221222_cn",
5303+
"event_20220818_cn",
53045304
"event_20260520_cn"
53055305
],
53065306
"option_cn": [
@@ -5313,10 +5313,10 @@
53135313
"event_20260520_cn"
53145314
],
53155315
"option_tw": [
5316-
"event_20221222_cn"
5316+
"event_20220818_cn"
53175317
],
53185318
"option_bold": [
5319-
"event_20221222_cn",
5319+
"event_20220818_cn",
53205320
"event_20260520_cn"
53215321
]
53225322
},
@@ -5704,7 +5704,7 @@
57045704
"type": "select",
57055705
"value": "campaign_main",
57065706
"option": [
5707-
"event_20221222_cn",
5707+
"event_20220818_cn",
57085708
"event_20260520_cn"
57095709
],
57105710
"option_cn": [
@@ -5717,10 +5717,10 @@
57175717
"event_20260520_cn"
57185718
],
57195719
"option_tw": [
5720-
"event_20221222_cn"
5720+
"event_20220818_cn"
57215721
],
57225722
"option_bold": [
5723-
"event_20221222_cn",
5723+
"event_20220818_cn",
57245724
"event_20260520_cn"
57255725
]
57265726
},

‎module/config/i18n/zh-TW.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@
737737
"event_20220428_cn": "復刻虹彩的終幕曲",
738738
"event_20220526_cn": "泠誓光庭",
739739
"event_20220728_cn": "復刻雄鷹的敘事歌",
740-
"event_20220818_cn": "遠匯點作戰",
740+
"event_20220818_cn": "復刻遠匯點作戰",
741741
"event_20220915_cn": "復刻紫絳槿嵐",
742742
"event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",
743743
"event_20221222_cn": "復刻定向折疊",

‎module/device/method/utils.py‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -301,32 +301,53 @@ def get_serial_pair(serial):
301301
return None, None
302302

303303

304-
def remove_prefix(s, prefix):
304+
@t.overload
305+
def removeprefix(s: str, prefix: str) -> str: ...
306+
307+
308+
@t.overload
309+
def removeprefix(s: bytes, prefix: bytes) -> bytes: ...
310+
311+
312+
@t.overload
313+
def removesuffix(s: str, suffix: str) -> str: ...
314+
315+
316+
@t.overload
317+
def removesuffix(s: bytes, suffix: bytes) -> bytes: ...
318+
319+
320+
def removeprefix(s, prefix):
305321
"""
306-
Remove prefix of a string or bytes like `string.removeprefix(prefix)`, which is on Python3.9+
322+
Backport `string.removeprefix(prefix)`, which is on Python>=3.9
307323
308324
Args:
309-
s (str, bytes):
310-
prefix (str, bytes):
325+
s (str | bytes):
326+
prefix (str | bytes):
311327
312328
Returns:
313-
str, bytes:
329+
str | bytes:
314330
"""
315-
return s[len(prefix):] if s.startswith(prefix) else s
331+
if s.startswith(prefix):
332+
return s[len(prefix):]
333+
return s
316334

317335

318-
def remove_suffix(s, suffix):
336+
def removesuffix(s, suffix):
319337
"""
320-
Remove suffix of a string or bytes like `string.removesuffix(suffix)`, which is on Python3.9+
338+
Backport `string.removesuffix(suffix)`, which is on Python>=3.9
321339
322340
Args:
323-
s (str, bytes):
324-
suffix (str, bytes):
341+
s (str | bytes):
342+
suffix (str | bytes):
325343
326344
Returns:
327-
str, bytes:
345+
str | bytes:
328346
"""
329-
return s[:-len(suffix)] if s.endswith(suffix) else s
347+
# s[:-0] is empty string, so we need to check if suffix is empty
348+
if suffix and s.endswith(suffix):
349+
return s[:-len(suffix)]
350+
return s
330351

331352

332353
class IniterNoMinicap(u2.init.Initer):

‎module/device/pkg_resources/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
logger.error('Patch pkg_resources failed, patch module does not exists')
2626

2727

28-
def remove_suffix(s, suffix):
28+
def removesuffix(s, suffix):
2929
"""
3030
Remove suffix of a string or bytes like `string.removesuffix(suffix)`, which is on Python3.9+
3131
@@ -36,7 +36,10 @@ def remove_suffix(s, suffix):
3636
Returns:
3737
str, bytes:
3838
"""
39-
return s[:-len(suffix)] if s.endswith(suffix) else s
39+
# s[:-0] is empty string, so we need to check if suffix is empty
40+
if suffix and s.endswith(suffix):
41+
return s[:-len(suffix)]
42+
return s
4043

4144

4245
class FakeDistributionObject:
@@ -71,7 +74,7 @@ def dict_installed_packages(self):
7174
# adbutils-0.11.0-py3.7.egg-info
7275
res = re.match(r'^([a-zA-Z0-9._]+)-([a-zA-Z0-9._]+)-', file)
7376
if res:
74-
version = remove_suffix(res.group(2), '.dist')
77+
version = removesuffix(res.group(2), '.dist')
7578
# version = res.group(2)
7679
obj = FakeDistributionObject(
7780
dist=res.group(1),

‎module/game_setting/setting_extractor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from tqdm import tqdm
66

77
from module.base.decorator import cached_property
8-
from module.device.method.utils import remove_prefix
8+
from module.device.method.utils import removeprefix
99

1010
REGEX_SETTING = re.compile(r'PlayerPrefs.Get(\w{1,10})\((.*)\)')
1111
REGEX_SETTING_KEY = re.compile(r'"(.*?)"')
@@ -173,7 +173,7 @@ def iter_generated_lines(self, folder):
173173
if not settings:
174174
continue
175175
yield ''
176-
f = remove_prefix(file, folder).replace("\\", "/")
176+
f = removeprefix(file, folder).replace("\\", "/")
177177
yield f' # {f}'
178178
for setting in settings:
179179
if setting.key in dic_settings:

0 commit comments

Comments
 (0)