Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
9e160953e1
|
@ -7,6 +7,7 @@ import com.ljsd.jieling.network.session.ISession;
|
|||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||
import com.ljsd.jieling.util.CBean2Proto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
@ -29,26 +30,15 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
int token = netData.getToken();
|
||||
int msgId = netData.getMsgId();
|
||||
int msgIndex = netData.getIndex();
|
||||
byte[] message = netData.parseClientProtoNetData();
|
||||
PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest getPlayerInfoRequest
|
||||
= PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest.parseFrom(message);
|
||||
= PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest.parseFrom(netData.parseClientProtoNetData());
|
||||
|
||||
LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}",
|
||||
userId, token,msgId,msgIndex,getPlayerInfoRequest.getNum(),getPlayerInfoRequest.getStr());
|
||||
User userForLogin = UserManager.getUserForLogin(userId);
|
||||
|
||||
CommonProto.Common.Player player = CommonProto.Common.Player
|
||||
.newBuilder()
|
||||
.setUid(userId)
|
||||
.setNicknime("戒灵666")
|
||||
.setExp(1000)
|
||||
.setVipLevel(1)
|
||||
.setFamilyId("abc")
|
||||
.setHead("head_image_1")
|
||||
.setGold(100002)
|
||||
.setGem(8888)
|
||||
.setChargeGem(1000)
|
||||
.build();
|
||||
User user = UserManager.getUserForLogin(userId);
|
||||
|
||||
CommonProto.Common.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager());
|
||||
|
||||
PlayerInfoProto.PlayerInfo.GetPlayerInfoResponse getPlayerInfoResponse
|
||||
= PlayerInfoProto.PlayerInfo.GetPlayerInfoResponse.newBuilder()
|
||||
|
|
|
@ -18,6 +18,9 @@ public class Item extends MongoBase {
|
|||
|
||||
private int endingTime;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getItemId() {
|
||||
return itemId;
|
||||
|
|
|
@ -5,8 +5,6 @@ import com.ljsd.common.mogodb.MongoBase;
|
|||
|
||||
public class PlayerManager extends MongoBase {
|
||||
|
||||
private int uid;
|
||||
|
||||
private String nickName;
|
||||
|
||||
private int level;
|
||||
|
@ -26,7 +24,6 @@ public class PlayerManager extends MongoBase {
|
|||
private int chargeGem;
|
||||
|
||||
|
||||
|
||||
public String getNickName() {
|
||||
return nickName;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
package com.ljsd.jieling.util;
|
||||
|
||||
import com.ljsd.jieling.logic.dao.Hero;
|
||||
import com.ljsd.jieling.logic.dao.Item;
|
||||
import com.ljsd.jieling.logic.dao.ItemManager;
|
||||
import com.ljsd.jieling.logic.dao.PlayerManager;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
|
||||
public class CBean2Proto {
|
||||
|
||||
|
||||
public static CommonProto.Common.Player getPlayer(int uid, PlayerManager playerManager) {
|
||||
CommonProto.Common.Player player = CommonProto.Common.Player
|
||||
.newBuilder()
|
||||
.setUid(uid)
|
||||
.setNicknime(playerManager.getNickName())
|
||||
.setExp(playerManager.getExp())
|
||||
.setVipLevel(playerManager.getVipLevel())
|
||||
.setFamilyId(playerManager.getFamilyId())
|
||||
.setHead(playerManager.getHead())
|
||||
.setGold(playerManager.getGold())
|
||||
.setGem(playerManager.getGem())
|
||||
.setChargeGem(playerManager.getChargeGem())
|
||||
.build();
|
||||
return player;
|
||||
}
|
||||
|
||||
public static CommonProto.Common.Item getItem(Item item){
|
||||
CommonProto.Common.Item itemProto = CommonProto.Common.Item
|
||||
.newBuilder()
|
||||
.setId(item.getId())
|
||||
.setItemId(item.getItemId())
|
||||
.setItemNum(item.getItemNum())
|
||||
.setItemType(item.getItemType())
|
||||
.setItemQuality(item.getItemQuality())
|
||||
.setIsStacking(item.isStacking())
|
||||
.setEndingTime(item.getEndingTime())
|
||||
.build();
|
||||
return itemProto;
|
||||
}
|
||||
|
||||
public static CommonProto.Common.Hero getHero(Hero hero){
|
||||
CommonProto.Common.Hero heroProto = CommonProto.Common.Hero
|
||||
.newBuilder()
|
||||
|
||||
.build();
|
||||
return heroProto;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue