Commit Graph

106 Commits

Author SHA1 Message Date
zhaodice
8013e7d2b9 Big World Resources Collection Implement (#1368)
* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-06-29 04:53:50 -07:00
GanyusLeftHorn
55ee6274f1 Add BP login trigger to daily reset. 2022-06-28 04:04:35 -07:00
GanyusLeftHorn
d5d5dd1233 Add daily and weekly mission reset. 2022-06-26 21:38:35 -07:00
AnimeGitB
d3012d0f1b Remove BPLevel, GodMode, NoStamina, SetWorldLevel, UnlimitEnergy, UnlockTower commands 2022-06-25 22:19:29 -07:00
AnimeGitB
09f7a2e69d PlayerProperty Refactor 2022-06-25 22:19:29 -07:00
AnimeGitB
9b1db9604a Allow offline Player objects to return their Account 2022-06-25 02:12:33 -07:00
GanyusLeftHorn
371e701dd9 Remove logging. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
c8fcff2ede Reset forge points every day to enable crafting of enhancement ores. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
e117bfac91 Move worldlevel for World to Player::setWorldLevel 2022-06-24 17:51:30 -07:00
Melledy
250a192b30 Random cleanups in the gameserver and player 2022-06-24 07:43:43 -07:00
Melledy
4bbcc4c9ca Implement battle pass triggers/rewards 2022-06-24 01:12:52 -07:00
GanyusLeftHorn
f7aaa7c093 Set world level automatically on level up. 2022-06-23 21:23:14 -07:00
Luke H-W
d0eb905631 Merge branch 'development' into Weather 2022-06-24 00:47:14 +09:30
AnimeGitB
4e3467366e Move weather from Scene to Player 2022-06-23 02:32:38 +09:30
KingRainbow44
6058e2b254 Fix Player on this branch 2022-06-22 00:22:23 -04:00
GanyusLeftHorn
f42334411b Bring back dungeon drops. 2022-06-21 19:49:46 -07:00
Melledy
23d7ef8378 Migrate battlepass to its own db collection 2022-06-21 07:59:10 -07:00
诗音澄鸢 镜苑芳依
d8f2421832 implement BattlePass (Except missions) (#1316)
* BattlePass

* BattlePass
2022-06-21 07:18:13 -07:00
Melledy
4501db1135 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Akka
89ba8f5d01 a little fix 2022-06-17 18:15:49 -07:00
Akka
d35ff068cf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka
1c0d869ee5 Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Melledy
0e6e950734 Cleanup package names 2022-06-16 07:57:57 -07:00
ImmuState
ded7ce1dcf 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
7126b1569e make sure towerData is not null (#1240)
* make sure towerData is not null

* Update Player.java

* add notice
2022-06-11 04:34:25 -07:00
zhaodice
f67649e56f 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
ImmuState
e30516d698 Send periodic notifications to the client for ongoing forges. 2022-06-08 05:43:38 -07:00
ImmuState
d7a4209138 Change active forges in player to list. 2022-06-08 05:43:38 -07:00
ImmuState
47bcfe96f6 Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq. 2022-06-08 05:43:38 -07:00
ImmuState
0c0719bd2a Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues. 2022-06-08 05:43:38 -07:00
zhaodice
9bf48ddbf7 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
ImmuState
4a676aa168 Persist unlocked blueprints to the database. 2022-06-03 00:52:22 -07:00
ImmuState
9d10b81b95 Unlock forging blueprints. 2022-06-03 00:52:22 -07:00
zhaodice
87e7d225cd Arresting small creature support (#1150)
* Arresting small creature support

* add InsectCaptureManager

* use EnvAnimalGatherExcelConfigData.json

* Update InsectCaptureManager.java
2022-06-03 00:51:51 -07:00
Melledy
8ef99db9d3 Rename excel classes 2022-05-30 20:06:25 -07:00
Yazawazi
91f8381fb1 [Anime Game Version update] Support 2.7 (#1072)
* feature(2.7 version): support 2.7 version & upload new protos

1. Support GC in GI 2.7.0;
2. Upload new protos;
3. Fix some bugs cuz by new protos.

BREAKING CHANGE: all

* fix(database helper): fix player uid issues

* fix(ability embryo): uint32 to fixed32

* fix(proto): map mark

rename MAP_MARK_FROM_TYPE_NOE to MAP_MARK_FROM_TYPE_NONE

* fix(game version): change game version to 2.7.0

* perf(proto): remove unused protos

1. Remove unused protos;
2. Temporarily commented out some of the proto fields.

* fix(proto): uint32 to fixed32
2022-05-30 20:06:25 -07:00
zhaodice
dc1741ce6d Hunting and deforestation support. (#1083)
* add drops for animals wild pig,fishes,foxes,birds

* append fox

* Deforestation Support

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* add AutoRecycleHashMap

Map's KEY is automatic expire if key long time no use (query or modify from HashMap)

* use AutoRecycleHashMap in case of memory leak

* fix bug

* remove prints

* static AutoRecycleHashMap

* fix problems

* Delete AutoRecycleHashMap.java

* remove log

* fix build

* improve

* remove unnecessary information

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>
2022-05-29 06:16:49 -07:00
Melledy
141b1913cb Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
ProxyismGH
fc687a3bde TeamManager avatar add refactor. 2022-05-26 22:54:36 -07:00
ImmuState
ef20177a6b Energy: Particle/Orb Drops from Monsters (#1054)
* Generate energy drops for monsters + make sure picking up particles honors their count.

* Use drop info from excels instead.

* Remove double newline.

* Remove commented code.
2022-05-24 21:43:04 -07:00
ShiroSaki
74649f28f6 Fix new account can't load codex datas 2022-05-23 23:55:46 -07:00
ShiroSaki
3a39545e34 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
ImmuState
42f5a66df7 Move energy-related logic to a new EnergyManager. 2022-05-22 12:55:55 -07:00
Akka
233b46b2f9 Support Boss Chest 2022-05-19 23:36:13 -07:00
Melledy
f53dda0335 Fix errors caused by merge + Refactor chests into GadgetChest 2022-05-18 02:36:50 -07:00
Melledy
73a88b2da2 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into dev-world-scripts 2022-05-18 02:24:00 -07:00
Melledy
17a273387e Implement local specialty spawning 2022-05-18 02:21:34 -07:00
Akka
7c02e6c912 Support Open Chest 2022-05-18 01:07:06 -07:00
Akka
8a7077dc04 Enable script in big world (#884)
* add docs for tower

* fix: LEAK: ByteBuf.release() was not called

* enableScriptInBigWorld

* not print log when loaded scripts from cache

* revert the change of server tick

* revert the change of server tick

* fix

* optimize the performance: lazy load & cache

* fix the refresh group

* fix NPE

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-05-15 04:19:24 -07:00
tiantian520
f1b12ccf63 Add a new command "nostamina" (#877)
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
2022-05-14 16:06:48 -07:00