Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/apps/worldserver/worldserver.conf.dist
#	src/server/game/Battlegrounds/Battleground.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
This commit is contained in:
郑佩茹
2022-07-13 10:31:30 -06:00
123 changed files with 6889 additions and 1214 deletions

View File

@@ -2423,14 +2423,16 @@ Rate.InstanceResetTime = 1
# The lower the rate the less experience is required.
# Default: 0.05
#
Rate.Pet.LevelXP = 0.05
#
# WaterBreath.Timer
# Description: The timer for player's breath underwater in minutes
# Default: 3
# Description: The timer for player's breath underwater in milliseconds
# Default: 180000 (3 minutes)
#
WaterBreath.Timer = 3
WaterBreath.Timer = 180000
#
# SkillGain.Crafting