# Conflicts: # globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java # globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java # globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java # serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java # serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java # serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java # serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java # serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java # serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java # serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java # serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java # serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java # serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java # serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java # serverlogic/src/main/thrift/idl/core.thrift # serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java # serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java # serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java # serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java # serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java # serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java # serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java # serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java # tablemanager/src/main/java/config/SLodeRankReward.java # tablemanager/src/main/java/config/STrumpBook.java # worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java # worldserver/src/main/java/com/world/thrift/idl/InnerResult.java # worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java # worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java |
||
---|---|---|
.. | ||
src/main | ||
build.gradle |