LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 21:09:25 +08:00
Code Activity
Files
a2e6986dcd9f00a9e86c4e7887cca1d25e427c52
Alas/assets/cn
History
LA_DI_DA a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
2024-10-25 12:01:29 +08:00
..
campaign
Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
2024-07-26 08:04:44 +08:00
coalition
Upd: [EN] Assets for page_coalition
2024-06-28 02:42:38 +08:00
combat
Add: Support Battle UI theme
2024-09-15 04:34:14 +08:00
combat_ui
Add: Support Battle UI theme
2024-09-15 04:34:14 +08:00
commission
…
daily
Add: Emergency module development daily
2023-03-17 00:34:02 +08:00
dorm
Add: Quick collection of coins and loves in the Dorm. (#3837)
2024-07-03 22:27:22 +08:00
equipment
fix: Adapt to new APIs from upstream
2024-05-19 19:59:03 +08:00
event
…
exercise
Merge branch 'refs/heads/LmeSzinc/master' into dev
2024-10-25 12:01:29 +08:00
freebies
Upd: Battle pass assets
2024-10-01 17:34:13 +08:00
gacha
Fix: Error caused by empty build queue (#2816)
2023-06-30 15:32:41 +08:00
gg_handler
Revert "Add: scroll dock to load all ship's data for changing attribute"
2023-10-19 13:42:22 +08:00
guild
Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF
2023-06-09 00:19:01 +08:00
handler
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
hard
…
map
Merge remote-tracking branch 'refs/remotes/Lme/master' into dev
2024-07-26 08:04:44 +08:00
meowfficer
Upd: Update CN assets which have been omitted
2023-11-19 21:45:25 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Opt: Choose minigame by scroll
2023-08-08 00:03:41 +08:00
os
Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527)
2022-10-04 00:25:42 -04:00
os_ash
Add: Allow auto attack dossier (#2579)
2023-06-08 22:28:44 +08:00
os_combat
…
os_handler
Fix: current ap blocked by info bar (#4100)
2024-08-20 02:25:44 +08:00
os_shop
Feature: New OpsiShop. (#3086)
2024-06-17 11:24:40 +08:00
raid
Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL
2024-03-29 03:21:10 +08:00
research
Upd: Detect research series 7
2024-07-12 00:07:25 +08:00
research_farming
Add: pick out auto research farming from more alas
2024-07-07 11:53:00 +08:00
retire
Merge Lme/Master into dev
2024-07-22 16:45:29 +08:00
reward
Mov: reward mail support to separate module
2022-10-16 01:01:15 -04:00
shipyard
Upd: Series selecting page in shipyard
2024-07-12 00:31:34 +08:00
shop
fix: shop confirm amount buttom (#3001)
2023-08-11 19:05:52 +08:00
sos
Fix: [EN] Confirm button in SOS signal search list
2022-12-07 01:38:57 +08:00
statistics
…
storage
…
tactical
Fix: Trying to handle books empty (#3753)
2024-06-11 23:38:43 +08:00
template
Upd: Update event Ode of Everblooming Crimson(event_20240912_cn)
2024-09-13 18:38:43 +08:00
ui
Merge branch 'refs/heads/LmeSzinc/master' into dev
2024-10-25 12:01:29 +08:00
ui_white
Add: show player info in dashboard
2024-07-21 12:53:55 +08:00
war_archives
Upd: war archives entrance
2024-10-20 21:58:34 +08:00