# Conflicts: # luafight/Modules/Battle/Logic/Base/Passivity.lua # luafight/Modules/Battle/Logic/Misc/BattleUtil.lua # luafight/Modules/Battle/Logic/Role/RoleLogic.lua # serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java # serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java # serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java |
||
---|---|---|
.. | ||
src/main/java | ||
build.gradle |