LmeSzinc e918a5db97 Merge branch 'gems_farming' into dev ...

# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py

2021-07-24 17:33:58 +08:00

..

campaign

Fix: [EN] fixed SWITCH_2_EX asset

2021-03-28 18:43:20 -03:00

combat

Fix: Detection of PAUSE during the boss appear animation

2021-02-17 18:01:26 +08:00

daemon

Add: [EN] Ambush assets updated

2020-06-06 15:44:58 -03:00

daily

Add: Daily Skip assets

2021-04-16 09:44:22 -04:00

equipment

Add: Flagship changing

2021-06-29 23:10:13 +08:00

exercise

Fix: [EN] QUIT_RECONFIRM down scaled after update

2021-07-22 15:33:07 -04:00

guild

Upd: Default to 1 for normal behavior, join whenever available, other server assets

2021-04-02 21:00:54 -04:00

handler

Fix: Handle return account info

2021-07-11 21:41:05 +08:00

hard

Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil

2020-07-15 03:39:04 +08:00

map

Fix: Re-implement hard mode detection

2021-06-10 17:46:55 +08:00

os

Fix: [EN] ZONE_SWITCH icon to text asset

2021-07-16 15:05:52 -04:00

os_ash

Fix: [EN] ASH_ENTRANCE asset update

2021-06-10 23:53:24 -04:00

os_combat

Fix: [EN] Semi-auto for operation siren

2020-12-23 14:18:38 -05:00

os_handler

Fix: after game update, 2x book auto and auto search related assets out dated

2021-07-08 20:24:16 -04:00

raid

Fix: [EN] raid asset ticket usage

2021-07-10 14:55:44 -04:00

research

Upd: [EN] page_research transitions same as others, now has unique titles across all reshmenu pages after last update

2021-07-15 21:58:21 -04:00

retire

Del: Replace SR_SSR_CONFIRM with popup_confirm

2021-07-04 18:17:57 +08:00

reward

Add: [CN, JP, TW] counterpart assets, config, and gui updates

2021-07-18 19:54:20 -04:00

shop

Add: [EN] shop module related assets

2021-07-10 23:05:39 -04:00

sos

Fix: Assets for sos signal and commission notice

2020-12-22 18:39:58 +08:00

statistics

Dev: Item statistics rework

2020-08-09 11:34:59 +08:00

template

Add: Siren templates in Azur Anthem SP4

2021-07-23 21:01:37 +08:00

ui

Fix: Resolve merge conflict ui/assets.py

2021-07-23 10:21:26 -04:00

war_archives

Fix: [EN] Support for Ink-Stained Steel Sakura, update module reference to local

2021-04-08 23:24:07 -04:00