# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java # serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java # serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java # serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java # serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java # serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java # serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java # serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java # serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java # serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java # tablemanager/src/main/java/config/SErrorCodeEerverConfig.java # tablemanager/src/main/java/config/SItem.java # tablemanager/src/main/java/config/SJewelConfig.java |
||
---|---|---|
.. | ||
src/main/java/com | ||
build.gradle |