diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index e6d2b88c0..68c328590 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -250,7 +250,7 @@ public class GMRequestHandler extends BaseHandler{ break; case GlobalGm.RESET_USER_NAME: - PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0); + PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0,-1); break; case GlobalGm.CREATE_INVADE: CombatLogic.getInstance().callInvasionBoss(iSession,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/RandomNameRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/RandomNameRequestHandler.java similarity index 87% rename from serverlogic/src/main/java/com/ljsd/jieling/handler/RandomNameRequestHandler.java rename to serverlogic/src/main/java/com/ljsd/jieling/handler/player/RandomNameRequestHandler.java index 8d594fb20..36c12862e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/RandomNameRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/RandomNameRequestHandler.java @@ -1,5 +1,6 @@ -package com.ljsd.jieling.handler; +package com.ljsd.jieling.handler.player; +import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -9,7 +10,7 @@ import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; @Component -public class RandomNameRequestHandler extends BaseHandler{ +public class RandomNameRequestHandler extends BaseHandler { @Override public MessageTypeProto.MessageType getMessageCode() { return MessageTypeProto.MessageType.RANDOMNAME_REQUEST; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/ReNameRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ReNameRequestHandler.java similarity index 82% rename from serverlogic/src/main/java/com/ljsd/jieling/handler/ReNameRequestHandler.java rename to serverlogic/src/main/java/com/ljsd/jieling/handler/player/ReNameRequestHandler.java index 906a10646..caffe3132 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/ReNameRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ReNameRequestHandler.java @@ -1,5 +1,6 @@ -package com.ljsd.jieling.handler; +package com.ljsd.jieling.handler.player; +import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -11,7 +12,7 @@ import org.luaj.vm2.ast.Str; import org.springframework.stereotype.Component; @Component -public class ReNameRequestHandler extends BaseHandler{ +public class ReNameRequestHandler extends BaseHandler { @Override public MessageTypeProto.MessageType getMessageCode() { return MessageTypeProto.MessageType.RENAME_REQUEST; @@ -24,6 +25,7 @@ public class ReNameRequestHandler extends BaseHandler{ String name = reNameRequest.getName(); int type = reNameRequest.getType(); int teamPosId = reNameRequest.getTeamPosId(); - PlayerLogic.getInstance().resetUserName(iSession,name,type,teamPosId); + int sex = reNameRequest.hasSex()?reNameRequest.getSex():0; + PlayerLogic.getInstance().resetUserName(iSession,name,type,teamPosId,sex); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 05e761284..8f046938d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -27,6 +27,8 @@ public class PlayerManager extends MongoBase { private String nickName; + private int sex; + private int level; private int exp; @@ -571,4 +573,13 @@ public class PlayerManager extends MongoBase { updateString("rideLevel", rideLevel); } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + updateString("sex", sex); + this.sex = sex; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index f11bc5580..6ab17ff81 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -114,7 +114,7 @@ public class PlayerLogic { * @param name * @param type 1:玩家起名 2: 阵容起名 3 玩家改名 */ - public void resetUserName(ISession iSession, String name, int type,int teamPosId) throws Exception { + public void resetUserName(ISession iSession, String name, int type,int teamPosId,int sex) throws Exception { int uid = iSession.getUid(); int msgId = MessageTypeProto.MessageType.RENAME_RESPONSE_VALUE; User user = UserManager.getUser(uid); @@ -136,6 +136,9 @@ public class PlayerLogic { RedisUtil.getInstence().del(delkey); } playerInfoManager.setNickName(name); + if(sex==0||sex==1){ + playerInfoManager.setSex(sex); + } String key = RedisKey.getKey(RedisKey.C_User_Name_Key, name, false); RedisUtil.getInstence().set(key, String.valueOf(uid),RedisKey.REDIS_OVER_FOREVER); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 3d9e7e02d..85a620e9c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -49,6 +49,7 @@ public class CBean2Proto { .setDesignation(playerManager.getDesignation()) .setRide(playerManager.getRide()) .setRideLevel(playerManager.getRideLevel()) + .setSex(playerManager.getSex()) .setDecrotion(playerManager.getDecoration()); String mathcInfo = RedisUtil.getInstence().getObject(RedisKey.MATCH_UID_KEY + ":" + uid, String.class); if(!StringUtil.isEmpty(mathcInfo)){