diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 7f24f1942..88e463477 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -209,7 +209,7 @@ public class MapLogic { public void fightEnd(ISession session, int result, List heroInfos, MessageTypeProto.MessageType messageType) throws Exception { int uid = session.getUid(); String key = RedisKey.getKey(RedisKey.FIGHT, Integer.toString(uid), false); - String fightInfo = RedisUtil.getInstence().getAndDelete(key); + String fightInfo = (String) RedisUtil.getInstence().getAndDelete(key); if (fightInfo == null || fightInfo.isEmpty()) { MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "未开始战斗"); return; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java b/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java index 60fbdcf1e..160ee3e76 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java @@ -1,7 +1,6 @@ package com.ljsd.jieling.network.session; -import com.google.protobuf.GeneratedMessage; + import com.ljsd.jieling.netty.NettyGameSession; -import com.ljsd.jieling.network.server.ServerCacheMessage; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index 6f68d2aec..b0712c2c7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -1,19 +1,15 @@ package com.ljsd.jieling.util; import com.google.protobuf.GeneratedMessage; -import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.PackageConstant; import com.ljsd.jieling.netty.cocdex.Tea; -import com.ljsd.jieling.network.server.ServerCacheMessage; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Base64; - public class MessageUtil { private static final Logger LOGGER = LoggerFactory.getLogger(MessageUtil.class); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/SysUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/SysUtil.java index 4e647a18e..733930214 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/SysUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/SysUtil.java @@ -40,7 +40,9 @@ public class SysUtil { } public static void main(String[] args) throws IOException { - System.out.println(getPath("gameserver\\src\\com\\ljsd\\gameserver\\user\\dao\\")); + System.out.println(getPath("fight\\src\\main\\resources\\hello.lua")); + System.out.println(getRootPath()); + System.out.println(getPath("fight\\src\\com\\ljsd\\gameserver\\user\\dao\\")); }