LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 14:39:32 +08:00
Code Activity
7,580 Commits 12 Branches 0 Tags
79e449a258d2cc20eb8e23e1c95b2d930c8454bb
Commit Graph

7580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LA-DI-DA
79e449a258 Add: handle retirement when map preparation after clicking MAP_PREPARATION 2023-09-16 12:28:28 +08:00
LA-DI-DA
dbe45c498d Merge branch 'lme-alas/master' into smallkai 2023-09-16 00:07:17 +08:00
LmeSzinc
72dcbab1f8 Merge pull request #3128 from LmeSzinc/dev 
Add: Effulgence Before Eclipse BD and SP
 2023-09-15 23:45:55 +08:00
LmeSzinc
48dd665448 Opt: Effulgence Before Eclipse SP 2023-09-15 23:42:57 +08:00
霞飛
59f37b567b feat: Effulgence Before Eclipse chapter SP (#3127) 2023-09-15 23:01:25 +08:00
LmeSzinc
b2d74f680e Add: Effulgence Before Eclipse chapter BD 2023-09-15 22:05:13 +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
LA-DI-DA
833a80b584 Fix(tmp): inappropriate lv32 trigger when using "GemsFarming" which set to hard mode map 2023-09-15 20:09:52 +08:00
LA-DI-DA
1bdb8c842a Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2023-09-15 11:17:08 +08:00
Zuosizhu
7fdba38b75 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:51:24 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +08:00
LmeSzinc
b777529d7a Dev: Siren name translation in Effulgence Before Eclipse 2023-09-15 02:43:24 +08:00
LmeSzinc
5d49732358 Merge pull request #3122 from LmeSzinc/dev 
Bug fix
 2023-09-15 02:42:29 +08:00
LmeSzinc
b52da42d71 Add: TEMPLATE_SIREN_Zuiho 2023-09-15 02:37:23 +08:00
LmeSzinc
33f426d40d Fix: Different siren scales in A2 C2 2023-09-15 02:26:07 +08:00
LmeSzinc
e4355f9989 Merge pull request #3121 from LmeSzinc/dev 
Add: Effulgence Before Eclipse chapter AC
 2023-09-15 01:56:42 +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
1092371d8d Merge pull request #3120 from LmeSzinc/dev 
Bug fix
 2023-09-15 00:06:22 +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
ada2962520 Merge pull request #3119 from LmeSzinc/dev 
Bug fix
 2023-09-14 23:42:00 +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
LA-DI-DA
6a33eda8f2 Fix: lack of event option 2023-09-12 11:57:59 +08:00
LA-DI-DA
36528d6403 Adj: enable to show all event 2023-09-12 11:51:34 +08:00
LA-DI-DA
1156a76e77 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-12 11:09:18 +08:00
Zuosizhu
fb33f016b5 Merge pull request #2 from 0O0o0oOoO00/20230309-fix 
Fix: Accidentally deleted Event-3
 2023-09-11 23:19:26 +08:00
LA-DI-DA
e9ae87d070 Fix: Accidentally deleted Event-3 2023-09-11 23:11:41 +08:00
LA-DI-DA
7a716a2e3c Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-09-11 21:48:50 +08:00
Zuosizhu
f8a35cec1c Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-09-11 08:16:09 +08:00
LmeSzinc
643c4074c9 Merge pull request #3108 from LmeSzinc/dev 
Bug fix
 2023-09-10 20:02:49 +08:00
LmeSzinc
be49dfc30e Doc: [CN] Add relative repositories 2023-09-10 20:00:50 +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
a565f518d9 Merge pull request #3105 from LmeSzinc/dev 
Bug fix
 2023-09-10 16:31:34 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
890f072643 Doc: [CN] Add QQ group and game settings 2023-09-10 15:58:06 +08:00
LmeSzinc
dd4cc0ea32 Fix: Skip stories in FleetSelector.open() (#3104) 2023-09-10 15:27:07 +08:00
LmeSzinc
cb9a4a71a7 Add: shop/os templates 2023-09-10 15:24:06 +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
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