LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 07:39:31 +08:00
Code Activity
7,997 Commits 12 Branches 0 Tags
1d2ce5db7f6f2ac8fbeb2e2d0660dd2fe5cde55c
Commit Graph

5585 Commits

Author SHA1 Message Date
LA-DI-DA
1d2ce5db7f Fix: server key check for OTHERS_LOGIN_NOTIFY_SERVER 2023-12-19 20:04:00 +08:00
LA-DI-DA
74c123dd06 Add: others' login check for jp 2023-12-15 23:19:57 +08:00
LA-DI-DA
1e41b28aa3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-24 17:04:42 +08:00
LA-DI-DA
824b353f3d Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2023-11-24 17:00:55 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
LmeSzinc
530128ea49 Add: Event entrance of The Ninja Scrolls: Azur Flash (event_20231123_cn) 2023-11-24 00:43:34 +08:00
RilyLC
f7461e3ad1 Upd:[TW]Event:Northern Overture Rerun (#3306) 2023-11-23 22:41:47 +08:00
LmeSzinc
eb27b88006 Merge pull request #3295 from weeswelai/ui_update_20231116 
Upd: [CN] Update assets which have been omitted
 2023-11-23 22:04:28 +08:00
ATH733
0efe9e3e43 Upd: Regex for merit shop (#3305) 2023-11-23 22:01:48 +08:00
LA-DI-DA
657d716ed5 Adjust 2023-11-22 16:19:40 +08:00
LA-DI-DA
eb6dcf3d98 Merge branch 'smallkai-dev' into smallkai 2023-11-22 14:45:05 +08:00
weeswelai
6090e9bcea Fix: Skip meow lock popup 2023-11-22 00:26:24 +08:00
LA-DI-DA
0f49d925a8 Fix: incorrect place of exit when server is under maintenance 2023-11-20 22:40:22 +08:00
LA-DI-DA
c262bbd4af Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/campaign/gems_farming.py
 2023-11-19 23:38:47 +08:00
LA-DI-DA
b05dc58c11 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-11-19 23:34:44 +08:00
weeswelai
01d2b4b6ce Upd: Update CN assets which have been omitted 2023-11-19 21:45:25 +08:00
LmeSzinc
e7d26bc0cc Upd: button_extract 2023-11-19 19:00:06 +08:00
LmeSzinc
7a55451cde Merge branch 'dev' into ui_update_20231116_en 2023-11-19 18:57:48 +08:00
Jiahao Yuan
cdca3237e9 Upd: [JP] Meowfficer assets (#3291) 
* Upd: [CN] Update meowfficer UI

* Upd: Update JP same assets

* Add: Appear MEOWFFICER_BUY_ENTER to ensure UI loading completed

* Upd: Update TW same assets

* Upd: Update meowfficer UI for EN

* Upd: [JP] Meowfficer assets

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: weeswelai <52352067+weeswelai@users.noreply.github.com>
 2023-11-19 18:55:51 +08:00
weeswelai
e0c819f3d1 FIx: Not click MEOWFFICER_FEED_CONFIRM 
Do MEOWFFICER_FEED.ocr first after  click feed button
 2023-11-18 19:18:49 +08:00
weeswelai
237e491ef4 Fix: Wait ui load fully 2023-11-18 19:18:26 +08:00
weeswelai
19a9d93aa8 Upd: Update EN meowfficer assets 2023-11-18 14:37:43 +08:00
Zuosizhu
c909df85d3 Merge branch 'LmeSzinc:master' into 20230309 2023-11-18 10:57:36 +08:00
weeswelai
671c14a2fc Upd: Update meowfficer UI for EN 2023-11-17 20:09:55 +08:00
weeswelai
3308be9a7e Upd: Update TW same assets 2023-11-17 20:03:22 +08:00
weeswelai
c66fdddbf4 Add: Appear MEOWFFICER_BUY_ENTER to ensure UI loading completed 2023-11-17 20:00:32 +08:00
weeswelai
8202516552 Upd: Update JP same assets 2023-11-17 19:57:08 +08:00
weeswelai
037f471a21 Upd: [CN] Update meowfficer UI 2023-11-17 19:43:02 +08:00
Zuosizhu
94c5fb4858 Merge branch 'LmeSzinc:master' into 20230309 2023-11-17 08:01:26 +08:00
RilyLC
d84010bfb1 Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285) 
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-15 18:28:47 +08:00
LA-DI-DA
ab502f0e77 Fix: wrong command name in gg handler 2023-11-11 15:58:40 +08:00
LA-DI-DA
a935f7e416 Fix: checking ship's experience that were overwritten in the previous merge 2023-11-11 13:38:25 +08:00
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LA-DI-DA
649f4819ef Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-10 16:57:59 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +08:00
LA-DI-DA
5faa7eb4d6 Add: click fleet advice when preparing hard mode map 2023-11-10 16:22:47 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
LmeSzinc
3ce8665f0f Fix: Collect coins and loves in dorm 2023-11-10 12:00:30 +08:00
LmeSzinc
1dad0031f1 Add: Argument scaling in Template.match_multi() 2023-11-10 12:00:08 +08:00
Jiahao Yuan
114ffbdc9b Upd: campaign (#3274) 2023-11-10 11:28:11 +08:00
Jiahao Yuan
1d6bf0547f Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
hephooey
99a4478563 [TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
kahojyun
a236144eae Upd: [JP] MEOWFFICER_GOLD/PURPLE_CHECK (#3259) 2023-11-10 00:14:52 +08:00
LA-DI-DA
c95825269b Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-09 19:03:13 +08:00
LA-DI-DA
02691fc408 Rmv: remove ship in GemsFarming when in hard mode 2023-11-09 19:01:33 +08:00
guoh064
4ae8438338 Upd: [JP] RETIRE_COIN (#3267) 2023-11-09 15:35:31 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +08:00
RilyLC
a44ffa8c75 Upd: [TW]update dorm assets (#3256) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-03 03:32:15 +08:00