ferina8-14 47adffd1a0 Merge branch 'master' into try_jp ... [JP] copy assets from cn # Conflicts: # module/combat/assets.py # module/daemon/assets.py # module/handler/assets.py # module/retire/assets.py # module/reward/assets.py		2020-06-13 03:29:35 +09:00
..
campaign_hard	Fix: 修复在每日中启用血量平衡报错的问题	2020-05-02 18:48:27 +08:00
campaign_main	Create campaign_10_3.py	2020-06-08 18:35:11 +02:00
event_20200227_cn	Initial commit	2020-03-29 01:41:34 +08:00
event_20200312_cn	Initial commit	2020-03-29 01:41:34 +08:00
event_20200326_cn	Fix: 修复了一堆bug	2020-04-07 11:20:38 +08:00
event_20200423_cn	New assets	2020-05-28 18:37:17 -03:00
event_20200507_cn	Fix: 修复夜幕下的归途SP2的BOSS刷新点错误	2020-05-07 21:49:39 +08:00
event_20200521_cn	Fix: 优化穹顶下的圣咏曲D3	2020-05-25 01:54:54 +08:00
event_20200521_en	Fix: [EN] event map	2020-06-01 02:46:05 +08:00
event_20200603_cn	Add: [CN] Event「峡湾间的反击」(event_20200603_cn)	2020-06-03 22:15:25 +08:00
event_20200603_en	Fix: [EN] Fix SP2 of the 'Prelude under the Moon' not catching the Mystery	2020-06-03 19:32:54 -03:00
event_20200603_jp	Add: [JP] add event 20200603 for jp server	2020-06-13 02:55:07 +09:00
event_20200611_en	Add: [EN] Skybound Oratorio	2020-06-11 23:13:50 +08:00