Commit Graph

34 Commits

Author SHA1 Message Date
github-actions
ae2d1fe438 Fix whitespace [skip actions] 2022-07-21 00:22:26 -07:00
Melledy
55541fa1da Add a loadReader helper function to DataLoader
Also minor name changing on a few DataLoader methods
2022-07-21 00:21:00 -07:00
Melledy
2e19e70fe1 Refactor game server managers to systems 2022-07-21 00:21:00 -07:00
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
2dcdb839c4 Move resource loading messages to the debug level 2022-06-26 12:26:39 -04:00
Melledy
5eb1d34b14 Implement battle pass triggers/rewards 2022-06-24 01:12:52 -07:00
GanyusLeftHorn
63b6b805cc Bring back dungeon drops. 2022-06-21 19:49:46 -07:00
Melledy
2915b14c1f 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
ImmuState
6e955c9fdb Implement Resin (#1257)
* Basic resin usage/refresh.

* Honor resin config, move some logic to logon.

* Add resin usage to DungeonChallenge

* Make fragile and transient resin usable.

* Get resin cost from dungeon excel.

* Add ability to unlock combine diagrams.

* Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin.

* Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin.

* Remove comment

* Check resin usage in addResin
2022-06-14 01:14:15 -07:00
zhaodice
052e70e488 Fix inconformity of Player Object at TowerManager (#1226)
* Fix inconformity of Player Object at TowerManager

Fix inconformity of Player Object at TowerManager class from GameSession

* fix with a reasonable resolution

* Make sure towerManager'player is online player

* Make sure towerManager'player is online player

* Obsolete storage

* Fix build

* fix build

* fix build

* add @Entity

* set record map

* replace tab with space

* add Entity to TowerData

* make infomater more accurate

* move player register to onLogin
2022-06-09 13:38:53 -07:00
zhaodice
ecf7a81ad1 Fix unable to save game data occasionally (#1194)
* Fix unable to save game data occasionally

* No self-kicking

* Game data synchronization

* finally

* prevent duplicated saving

* reverse changing

* keep the previous code

* Update GameServerInitializer.java

* Update GameSession.java

* remove sanity check because of try block

* a session needs can be created without a pipeline.
2022-06-05 04:23:19 -07:00
Melledy
a23b29b65a Rename excel classes 2022-05-30 20:06:25 -07:00
Akka
791b9534b7 refactor the challenge 2022-05-23 15:46:17 -07:00
Akka
717c2d1dd7 Support Boss Chest 2022-05-19 23:36:13 -07:00
Akka
bad853573c optimized the Lua func binding so that the script will not eval again 2022-05-18 20:51:39 -07:00
Melledy
cbd46e9215 Add one more quest trigger 2022-05-13 05:33:43 -07:00
Akka
faa3cde575 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Akka
65c93a747c Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Akka
4b6842f006 Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
Akka
c2d2a37fc5 Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
b58bcda0c8 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Akka
c912b8d857 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
3d3f36cf56 Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
EtherealAO
5e0e65123e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops
Also fixed a few dungeon script handlers
2022-05-03 23:24:43 -07:00
dogdie233
16f77ee520 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
Melledy
d877d7eebc Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
72e9a21ce3 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
8ab2b446cd Clean script events 2022-04-29 00:00:23 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons
Only a few are supported right now
You will need certain script files in ./resources/Scripts
2022-04-28 22:19:14 -07:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Melledy
7925d1cda3 Initial commit 2022-04-17 05:43:07 -07:00