Merge pull request #1615 from zhou525/pr_1574_bugfix

Browse Source

Fix: OneHitMode and call AshBeaconTask time conflicts

...

This commit is contained in:

LmeSzinc

2022-09-11 22:02:15 +08:00

committed by GitHub

parent e8dcdeaf65 fa1e5190e0

commit 0bd2cf389b

19 changed files with 60 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/cn/os_ash/META_BEGIN_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 80 KiB After Width:  |  Height:  |  Size: 7.9 KiB

BIN

assets/cn/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 154 KiB

BIN

assets/cn/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 KiB After Width:  |  Height:  |  Size: 6.3 KiB

BIN

assets/en/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/en/os_ash/META_BEGIN_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 80 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/en/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 154 KiB

BIN

assets/en/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 KiB After Width:  |  Height:  |  Size: 6.3 KiB

BIN

assets/jp/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/jp/os_ash/META_BEGIN_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 80 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/jp/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 154 KiB

BIN

assets/jp/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 KiB After Width:  |  Height:  |  Size: 6.3 KiB

BIN

assets/tw/os_ash/META_BEGIN_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/tw/os_ash/META_BEGIN_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 80 KiB After Width:  |  Height:  |  Size: 7.9 KiB

BIN

assets/tw/os_ash/META_MAIN_DOSSIER_ENTRANCE.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 154 KiB

BIN

assets/tw/os_ash/META_MAIN_DOSSIER_ENTRANCE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 KiB After Width:  |  Height:  |  Size: 6.3 KiB