Skip to content

Commit 87a3968

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents e1b6192 + 7e6fa47 commit 87a3968

12 files changed

Lines changed: 70 additions & 45 deletions

File tree

-4.93 KB
Loading
-25.1 KB
Binary file not shown.
-25.1 KB
Binary file not shown.
-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
@@ -1656,7 +1656,7 @@
16561656
"type": "select",
16571657
"value": "campaign_main",
16581658
"option": [
1659-
"event_20221222_cn",
1659+
"event_20220818_cn",
16601660
"event_20260520_cn"
16611661
],
16621662
"option_cn": [
@@ -1669,10 +1669,10 @@
16691669
"event_20260520_cn"
16701670
],
16711671
"option_tw": [
1672-
"event_20221222_cn"
1672+
"event_20220818_cn"
16731673
],
16741674
"option_bold": [
1675-
"event_20221222_cn",
1675+
"event_20220818_cn",
16761676
"event_20260520_cn"
16771677
]
16781678
},
@@ -1978,7 +1978,7 @@
19781978
"type": "select",
19791979
"value": "campaign_main",
19801980
"option": [
1981-
"event_20221222_cn",
1981+
"event_20220818_cn",
19821982
"event_20260520_cn"
19831983
],
19841984
"option_cn": [
@@ -1991,10 +1991,10 @@
19911991
"event_20260520_cn"
19921992
],
19931993
"option_tw": [
1994-
"event_20221222_cn"
1994+
"event_20220818_cn"
19951995
],
19961996
"option_bold": [
1997-
"event_20221222_cn",
1997+
"event_20220818_cn",
19981998
"event_20260520_cn"
19991999
]
20002000
},
@@ -2375,7 +2375,7 @@
23752375
"type": "select",
23762376
"value": "campaign_main",
23772377
"option": [
2378-
"event_20221222_cn",
2378+
"event_20220818_cn",
23792379
"event_20260520_cn"
23802380
],
23812381
"option_cn": [
@@ -2388,10 +2388,10 @@
23882388
"event_20260520_cn"
23892389
],
23902390
"option_tw": [
2391-
"event_20221222_cn"
2391+
"event_20220818_cn"
23922392
],
23932393
"option_bold": [
2394-
"event_20221222_cn",
2394+
"event_20220818_cn",
23952395
"event_20260520_cn"
23962396
]
23972397
},
@@ -4112,7 +4112,7 @@
41124112
"type": "select",
41134113
"value": "campaign_main",
41144114
"option": [
4115-
"event_20221222_cn",
4115+
"event_20220818_cn",
41164116
"event_20260520_cn"
41174117
],
41184118
"option_cn": [
@@ -4125,10 +4125,10 @@
41254125
"event_20260520_cn"
41264126
],
41274127
"option_tw": [
4128-
"event_20221222_cn"
4128+
"event_20220818_cn"
41294129
],
41304130
"option_bold": [
4131-
"event_20221222_cn",
4131+
"event_20220818_cn",
41324132
"event_20260520_cn"
41334133
]
41344134
},
@@ -4526,7 +4526,7 @@
45264526
"type": "select",
45274527
"value": "campaign_main",
45284528
"option": [
4529-
"event_20221222_cn",
4529+
"event_20220818_cn",
45304530
"event_20260520_cn"
45314531
],
45324532
"option_cn": [
@@ -4539,10 +4539,10 @@
45394539
"event_20260520_cn"
45404540
],
45414541
"option_tw": [
4542-
"event_20221222_cn"
4542+
"event_20220818_cn"
45434543
],
45444544
"option_bold": [
4545-
"event_20221222_cn",
4545+
"event_20220818_cn",
45464546
"event_20260520_cn"
45474547
]
45484548
},
@@ -4940,7 +4940,7 @@
49404940
"type": "select",
49414941
"value": "campaign_main",
49424942
"option": [
4943-
"event_20221222_cn",
4943+
"event_20220818_cn",
49444944
"event_20260520_cn"
49454945
],
49464946
"option_cn": [
@@ -4953,10 +4953,10 @@
49534953
"event_20260520_cn"
49544954
],
49554955
"option_tw": [
4956-
"event_20221222_cn"
4956+
"event_20220818_cn"
49574957
],
49584958
"option_bold": [
4959-
"event_20221222_cn",
4959+
"event_20220818_cn",
49604960
"event_20260520_cn"
49614961
]
49624962
},
@@ -5354,7 +5354,7 @@
53545354
"type": "select",
53555355
"value": "campaign_main",
53565356
"option": [
5357-
"event_20221222_cn",
5357+
"event_20220818_cn",
53585358
"event_20260520_cn"
53595359
],
53605360
"option_cn": [
@@ -5367,10 +5367,10 @@
53675367
"event_20260520_cn"
53685368
],
53695369
"option_tw": [
5370-
"event_20221222_cn"
5370+
"event_20220818_cn"
53715371
],
53725372
"option_bold": [
5373-
"event_20221222_cn",
5373+
"event_20220818_cn",
53745374
"event_20260520_cn"
53755375
]
53765376
},
@@ -5758,7 +5758,7 @@
57585758
"type": "select",
57595759
"value": "campaign_main",
57605760
"option": [
5761-
"event_20221222_cn",
5761+
"event_20220818_cn",
57625762
"event_20260520_cn"
57635763
],
57645764
"option_cn": [
@@ -5771,10 +5771,10 @@
57715771
"event_20260520_cn"
57725772
],
57735773
"option_tw": [
5774-
"event_20221222_cn"
5774+
"event_20220818_cn"
57755775
],
57765776
"option_bold": [
5777-
"event_20221222_cn",
5777+
"event_20220818_cn",
57785778
"event_20260520_cn"
57795779
]
57805780
},

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)