Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
a2cd81dc37
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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{
|
||||
|
|
|
|||
|
|
@ -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)){
|
||||
|
|
|
|||
Loading…
Reference in New Issue