Commit Graph

1820 Commits

Author SHA1 Message Date
plex
1814c28885 Update README.md 2022-06-15 04:11:04 -07:00
plex
e498526bdb Update README_zh-CN.md 2022-06-15 04:10:46 -07:00
yuyuko
8a3d6e3db4 Fix multi server function 2022-06-14 18:28:35 -07:00
ImmuState
ebab89d433 Don't show internal server error on gacha with full inventory. 2022-06-14 18:09:02 -07:00
ImmuState
e0d386105a Only send full clear notification on burst cast. 2022-06-14 18:08:55 -07:00
ImmuState
0db1472195 Adapt protocol for clearing energy. 2022-06-14 18:08:55 -07:00
xlpmyxhdr
521deab4f2 Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once
Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at one time, so that one Ancient Rock Dragon Lizard was generated at a time, and the attributes were different
2022-06-14 18:08:43 -07:00
Magix
efb57d58db Merge pull request #1263 from loulou310/development
Added french translation for server
2022-06-14 16:27:43 -04:00
loulou310
57918d0344 Added fr-FR.json 2022-06-14 21:44:42 +02:00
saucebing
458aadc2ff fix healing ability of some characters to some extent (#1201)
* fix healing ability of some characters to some extent

* using SerialName to replace replaceAll in avatar ability files reading

* add class HealAbilityManager

* move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager
2022-06-14 04:36:53 -07:00
Theosapira
95bc88202a Minor README update (#1246)
* Update README.md

Updated old jar link with new jar from actions

* Update README_zh-CN.md

Updated old jar link with new jar from actions
2022-06-14 01:15:03 -07:00
Tesutarin
7c9db30bca KickCommand: Remove unnecessary subpermission 2022-06-14 01:14:33 -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
Luke Hubmayer-Werner
2fd2fab54c Partial revert of #1245 2022-06-12 21:49:47 -07:00
Tesutarin
c5b45358e7 Command: Add permissionTargeted or targetRequirement 2022-06-12 17:55:19 -07:00
ImmuState
c4ce6caeba Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00
zhaodice
db039cc35b 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
Tesutarin
eb170bcb15 Language: Update translation 2022-06-10 21:20:50 -07:00
Magix
93d49a7a2c Change the version to 1.2.1-dev 2022-06-10 15:56:38 -04: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
Kurtivan2223
2b88487cd2 Proxy Update
Now you can Finally open sites, use apps that requires internet access which typically mitmproxy intercepts
2022-06-08 05:44:01 -07:00
ImmuState
a8d972c0c0 Make UI for blueprint unlocking behave. 2022-06-08 05:43:38 -07:00
ImmuState
4309e96253 Make calculation for partial claims better. 2022-06-08 05:43:38 -07:00
ImmuState
443cc8fc4b Make the UI behave. 2022-06-08 05:43:38 -07:00
ImmuState
9a313e50eb Send periodic notifications to the client for ongoing forges. 2022-06-08 05:43:38 -07:00
ImmuState
4b77e84e81 Add ForgeQueueDataNotify, unwhack UI. 2022-06-08 05:43:38 -07:00
ImmuState
0e1c8dc526 Cancel forging and refund items. 2022-06-08 05:43:38 -07:00
ImmuState
0cc4bad18c Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
28a8475cea Consume material. 2022-06-08 05:43:38 -07:00
ImmuState
a668bd6ec1 Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
5db5c90a8b Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
e5498e373e Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
9d6bc2a910 Change active forges in player to list. 2022-06-08 05:43:38 -07:00
ImmuState
8db0500e9d Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq. 2022-06-08 05:43:38 -07:00
ImmuState
3fc63c2c4b Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues. 2022-06-08 05:43:38 -07:00
Melledy
899a87a2ae Merge pull request #1215 from Grasscutters/stable
oooo dev branch forgor this 💀
2022-06-07 03:46:09 -07:00
Melledy
a8293102cf Merge branch 'development' into stable 2022-06-07 03:35:32 -07:00
Melledy
304b9cb8ed Delete BuildConfig.java 2022-06-07 03:27:43 -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
liizfq
934fb5873a add new command (unlimitenergy):toggle energyusage for each player (#1186)
* add new command (unlimitenergy):toggle energyusage for each player while  energyusage is ture in config.json

* Solve the problem of layout and naming errors

* make currentActiveTeam's Avatar full-energy while turn on the ule.

* Resolve language document errors

* add config_error message while player try to execute UnlimitEnergyCommand in GAME_OPTIONS.energyUsage == false
2022-06-04 19:14:52 -07:00
AZ
fa2ab59887 List game & server version when starting server (#1181)
* When the server starts, it now outputs the game and server version. Too dumb to not hardcode it - sorry!

* ...

* sorry i dropped my spaghetti, I'll help clean that

* Doing simple stuff: now without hardcoding!

* Restored Git hash functionality

* Fixed other languages and made the output more useful.

* Forgot this file lol
2022-06-04 02:41:18 -07:00
Melledy
910a5749f0 Refactor and optimize DatabaseHelper::checkIfPlayerExists 2022-06-03 19:32:10 -07:00
AZthemute
06546707e1 Fixed sendmessage command output.
Also clarified coop command in help command.
2022-06-03 19:11:47 -07:00
Tesutarin
66b642ef06 Language: Update translation 2022-06-03 10:16:45 -07:00
leonier-test
09580ef448 Ruin Guards/Hunters/Graders should drop Chaos Device series instead of Chaos Gear series. 2022-06-03 06:12:25 -07:00
leonier-test
0c5ff4377e Fix default Shop.json (for Mondstadt General Goods) 2022-06-03 06:12:04 -07:00
Paimon2022
a19e7c6db6 Spawn default monsters with different levels according to data/Spawns.json when worldLevelOverride is not zero.
For example, in world with worldlevel 8, base monster level is 90 according to resources/ExcelBinOutput/WorldLevelExcelConfigData.json,
monster level bias in data/Spawns.json belongs to [1,32], so the monster level would belong to [69, 100].
2022-06-03 03:20:07 -07:00
Paimon2022
4119f8b787 Add coordinate support for spawn command (monster only)
Now the spawn command is: spawn <entityID> [amount] [level(monster only)] <x> <y> <z>(monster only, optional)
The coordinate is optional
2022-06-03 03:19:59 -07:00
zhaodice
73a1c5762a skipping right characters panel for Android 2022-06-03 02:42:17 -07:00
zhaodice
bbc398d374 Incompletely implement about QuickUseWidgetReq
WARNING: with the consuming of material widget ( Example: bomb ),
this is just a implement designed to the decreasing of count

### Known Bug: No effects after using item but decrease. ###

If you know which Packet could make the effects, feel free to contribute!
2022-06-03 00:52:32 -07:00