LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 19:59:28 +08:00
Code Activity
7,524 Commits 12 Branches 0 Tags
b2ceb04bafc8e0c1d3dcccf2760b2ba79f8679d0
Commit Graph

5200 Commits

Author SHA1 Message Date
Zuosizhu
b2ceb04baf Merge remote-tracking branch 'origin/merged_origin_feature' into merged_origin_feature 2023-09-16 16:30:01 +08:00
Zuosizhu
6f37d69031 Opt: Restart emulator in some cases 2023-09-16 16:29:12 +08:00
Zuosizhu
c18eea9f05 Merge branch 'LmeSzinc:master' into merged_origin_feature 2023-09-16 07:53:41 +08:00
LmeSzinc
f68406f990 Fix: Disable STORY_ALLOW_SKIP in OpSi 2023-09-15 21:46:57 +08:00
LmeSzinc
802c1b6a08 Fix: Handle STORY_CLOSE after B3 2023-09-15 21:37:56 +08:00
Zuosizhu
8cdb5c6da0 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:52:31 +08:00
Zuosizhu
5dd82fb419 Merge branch 'master_lme' into merged_origin_feature 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-09-15 08:16:37 +08:00
LmeSzinc
b52da42d71 Add: TEMPLATE_SIREN_Zuiho 2023-09-15 02:37:23 +08:00
LmeSzinc
16ecea7163 Add: Effulgence Before Eclipse chapter AC 2023-09-15 01:49:53 +08:00
LmeSzinc
51d08a5419 Fix: STORY_ALLOW_SKIP should be True by default 2023-09-15 01:06:43 +08:00
LmeSzinc
4d50f15f3b Add: Event entrance of Effulgence Before Eclipse (event_20230914_cn) 2023-09-15 00:13:16 +08:00
LmeSzinc
7627a40bee Upd: [EN] AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2023-09-15 00:03:33 +08:00
LmeSzinc
4c4ac41f5e Fix: _story_option_buttons_2 parameters on complex background 2023-09-14 23:57:13 +08:00
LmeSzinc
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
LmeSzinc
c204aca18e Fix: Story skip 2023-09-14 23:32:18 +08:00
LmeSzinc
686b7fb921 Fix: Adaptive OCR_OIL to handle black overlay 2023-09-14 22:44:28 +08:00
LmeSzinc
cb31947881 Fix: Larger _auto_search_menu_offset when MULTIPLE_SORTIE appears 2023-09-14 22:44:28 +08:00
LmeSzinc
90771baca9 Fix: Handle AUTO_SEARCH_REWARD in strategy_search_enter() 2023-09-14 22:44:28 +08:00
Ian Lee
5474628561 Upd:[TW] Event:Violet Tempest Blooming Lycoris (#3118) 2023-09-14 22:43:35 +08:00
Zuosizhu
8bcb3808f8 Fix: Accidentally deleted Event-3 2023-09-13 07:55:49 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-09-11 08:16:09 +08:00
LmeSzinc
ab7d0ad9c0 Merge branch 'master' into feature 2023-09-10 20:05:24 +08:00
LmeSzinc
2de0641d65 Fix: Click stories if STORY_ALLOW_SKIP=False 2023-09-10 19:55:36 +08:00
襟江带海
79d398968e add: analysis resource collection (#3107) 2023-09-10 19:53:50 +08:00
LmeSzinc
39e3f8b221 Merge branch 'master' into feature 2023-09-10 16:35:45 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
dd4cc0ea32 Fix: Skip stories in FleetSelector.open() (#3104) 2023-09-10 15:27:07 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
4ce8bd0edb Sync: [SRC] Sync alas changes 2023-09-10 15:04:32 +08:00
guoh064
2b796483a5 Fix: End condition order in auto_search_combat of os_combat (#3103) 2023-09-10 14:45:02 +08:00
霞飛
6a1f3f574e Fix(JP): Asset of SHOP_BUY_CONFIRM (#3097) 
* Fix(JP): asset of SHOP_BUY_CONFIRM

* fix: use gif template instead
 2023-09-10 14:44:47 +08:00
LmeSzinc
73bc7b44a2 Add: Auto-update deploy.yaml.tpl 2023-09-09 20:03:50 +08:00
LmeSzinc
08a6d4611c Fix: Event schedule 2023-09-09 19:49:09 +08:00
LmeSzinc
4a95415837 Fix: Chinese encoding on launcher 2023-09-09 04:02:22 +08:00
iceynano
fcc32b8fa7 Fix: Error caused by loop of Daily Emergency Module Development (#3096) 
* Fix: Error caused by empty build queue

* feat: add BUILD_QUEUE_EMPTY assets

* fix: use image_color_count() for identify images

* chore: remove useless asset

* fix: Avoid info_bar and use appear()

* Fix Error Caused By Wrong Logic

---------

Co-authored-by: SaarChaffee <saarchaffee@qq.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-09-08 12:08:55 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
somegituser
17b13f6c6c add war_archive: Inverted orthant (#3089) 
新增作战档案：负象限作战
 2023-09-08 01:14:18 +08:00
LmeSzinc
078c6bb606 Revert "Upd: [EN] ACADEMY_CHECK" 
This reverts commit 6f2ea47c
 2023-09-08 01:10:52 +08:00
Zuosizhu
11dc3471aa Merge branch 'LmeSzinc:master' into 20230309 2023-09-03 09:53:28 +08:00
LmeSzinc
283ee7e687 Merge pull request #3079 from LmeSzinc/dev 
Bug fix
 2023-09-03 00:33:06 +08:00
霞飛
b19fbbbc91 Fix: OS shop in Akashi (#3078) 
* Fix: OS shop in Akashi

* Fix: OS shop's price area in Akashi
 2023-09-03 00:32:14 +08:00
LmeSzinc
b6e66b4a17 Fix: handle_fleet_emp_debuff in port (#3076) 2023-09-02 23:58:56 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
LmeSzinc
c987eb68cb Upd: Assets update 2023-09-01 02:21:37 +08:00
LmeSzinc
471d77d6a3 Upd: [JP] STORAGE_USE 2023-09-01 01:22:01 +08:00
LmeSzinc
6f2ea47c70 Upd: [EN] ACADEMY_CHECK 2023-09-01 01:21:55 +08:00
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00