头像提交
parent
8f34ad884a
commit
164a3cb45f
|
|
@ -17,7 +17,7 @@ public class UserBloodySnpInfo {
|
|||
|
||||
private String name;
|
||||
|
||||
private String head;
|
||||
private int head;
|
||||
|
||||
private int headFrame;
|
||||
|
||||
|
|
@ -91,11 +91,11 @@ public class UserBloodySnpInfo {
|
|||
this.name = name;
|
||||
}
|
||||
|
||||
public String getHead() {
|
||||
public int getHead() {
|
||||
return head;
|
||||
}
|
||||
|
||||
public void setHead(String head) {
|
||||
public void setHead(int head) {
|
||||
this.head = head;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2208,7 +2208,7 @@ public class MapLogic {
|
|||
.setLevel(playerInfoManager.getLevel())
|
||||
.setName(playerInfoManager.getNickName())
|
||||
.setFightId(score)
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setRank(rank++)
|
||||
.setTotalForce(userTmp.getPlayerInfoManager().getMaxForce())
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame()));
|
||||
|
|
@ -2252,7 +2252,7 @@ public class MapLogic {
|
|||
.setLevel(playerInfoManager.getLevel())
|
||||
.setName(playerInfoManager.getNickName())
|
||||
.setFightId(score)
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setRank(myRank)
|
||||
.setTotalForce(playerInfoManager.getMaxForce())
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame()).build());
|
||||
|
|
@ -2996,7 +2996,7 @@ public class MapLogic {
|
|||
CommonProto.TowerRank everyRank = CommonProto.TowerRank.newBuilder()
|
||||
.setUid(everyUser.getId())
|
||||
.setUserName(everyUser.getPlayerInfoManager().getNickName())
|
||||
.setHead(0)
|
||||
.setHead(everyUser.getPlayerInfoManager().getHead())
|
||||
.setHeadFrame(everyUser.getPlayerInfoManager().getHeadFrame())
|
||||
.setLevel(everyUser.getPlayerInfoManager().getLevel())
|
||||
.setTowerRankInfo(everyRankInfo)
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class GetMonsterAttackRankHandler extends BaseHandler<PlayerInfoProto.Get
|
|||
.setScore(score)
|
||||
.setLevel(playerInfoManager.getLevel())
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame())
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setRank(++start)
|
||||
.build();
|
||||
monsterRankInfos.add(monsterRankInfo);
|
||||
|
|
|
|||
|
|
@ -10,19 +10,22 @@ import org.springframework.stereotype.Component;
|
|||
|
||||
|
||||
@Component
|
||||
public class ModifyHeadFrameHandler extends BaseHandler {
|
||||
public class ModifyHeadFrameHandler extends BaseHandler<PlayerInfoProto.ModifyHeadRequest> {
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.MODIFY_HEAD_FRAME_REQUEST;
|
||||
return MessageTypeProto.MessageType.MODIFY_HEAD_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
byte[] bytes = netData.parseClientProtoNetData();
|
||||
|
||||
PlayerInfoProto.modifyHeadFrameRequest request = PlayerInfoProto.modifyHeadFrameRequest.parseFrom(bytes);
|
||||
int headFrameId = request.getHeadFrameId();
|
||||
PlayerLogic.getInstance().modifyHeadFrame(iSession,headFrameId,MessageTypeProto.MessageType.MODIFY_HEAD_FRAME_RESPONSE);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processWithProto(ISession iSession, PlayerInfoProto.ModifyHeadRequest proto) throws Exception {
|
||||
int headFrameId = proto.getHeadId();
|
||||
int type = proto.getType();
|
||||
PlayerLogic.getInstance().modifyHeadFrame(iSession,type,headFrameId,MessageTypeProto.MessageType.MODIFY_HEAD_RESPONSE);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1065,7 +1065,7 @@ public class ActivityLogic {
|
|||
.setForce(score)
|
||||
.setRank(++start)
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame())
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.build();
|
||||
useForceInfoList.add(personInfoBuild);
|
||||
}
|
||||
|
|
@ -1105,7 +1105,7 @@ public class ActivityLogic {
|
|||
.setScore(score)
|
||||
.setLevel(playerInfoManager.getLevel())
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame())
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setRank(++start)
|
||||
.build();
|
||||
expertInfos.add(personInfoBuild);
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ public class ArenaLogic {
|
|||
.setLevel(playerInfoManager.getLevel())
|
||||
.setName(playerInfoManager.getNickName())
|
||||
.setScore(score)
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setTotalForce(totalForce)
|
||||
.build();
|
||||
arenaEnemyList.add(CommonProto.ArenaEnemy.newBuilder()
|
||||
|
|
@ -461,7 +461,7 @@ public class ArenaLogic {
|
|||
.setLevel(playerInfoManager.getLevel())
|
||||
.setName(playerInfoManager.getNickName())
|
||||
.setScore(score)
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setRank(++start)
|
||||
.setTotalForce(totalForce)
|
||||
.setHeadFrame(playerInfoManager.getHeadFrame())
|
||||
|
|
@ -530,7 +530,7 @@ public class ArenaLogic {
|
|||
.setUid(attackId)
|
||||
.setName(playerInfoManager.getNickName())
|
||||
.setLevel(playerInfoManager.getLevel())
|
||||
.setHead(0)
|
||||
.setHead(playerInfoManager.getHead())
|
||||
.setTotalForce(attackForce)
|
||||
.setScore( RedisUtil.getInstence().getZSetScore(RedisKey.ARENA_RANK,Integer.toString(curSeason), Integer.toString(attackId)).intValue())
|
||||
.build();
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.ljsd.jieling.logic.dao;
|
|||
public class PlayerInfoCache {
|
||||
private int serverId;
|
||||
private String name;
|
||||
private String head;
|
||||
private int head;
|
||||
private int headFrame;
|
||||
private int level;
|
||||
private int guildPosition;
|
||||
|
|
@ -13,7 +13,7 @@ public class PlayerInfoCache {
|
|||
return name;
|
||||
}
|
||||
|
||||
public String getHead() {
|
||||
public int getHead() {
|
||||
return head;
|
||||
}
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ public class PlayerInfoCache {
|
|||
this.name = name;
|
||||
}
|
||||
|
||||
public void setHead(String head) {
|
||||
public void setHead(int head) {
|
||||
this.head = head;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class PlayerManager extends MongoBase {
|
|||
|
||||
private int vipLevel;
|
||||
|
||||
private String head;
|
||||
private int head;
|
||||
|
||||
private int mapId;
|
||||
|
||||
|
|
@ -153,11 +153,11 @@ public class PlayerManager extends MongoBase {
|
|||
return vipLevel;
|
||||
}
|
||||
|
||||
public String getHead() {
|
||||
public int getHead() {
|
||||
return head;
|
||||
}
|
||||
|
||||
public void setHead(String head) throws Exception {
|
||||
public void setHead(int head) throws Exception {
|
||||
updateString("head", head);
|
||||
this.head = head;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ public class UserManager {
|
|||
playerManager.setOpenId(openId);
|
||||
playerManager.setLevel(1);
|
||||
playerManager.setExp(0);
|
||||
playerManager.setHead("image_head_1");
|
||||
//todo 改默认
|
||||
playerManager.setHead(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getDefaultHead());
|
||||
playerManager.updateGuidePoint(1,1);
|
||||
playerManager.setCreateTime(now);
|
||||
playerManager.setLoginTime(now);
|
||||
|
|
|
|||
|
|
@ -578,6 +578,15 @@ public class GuildFightLogic {
|
|||
}
|
||||
}
|
||||
}
|
||||
if(GuilidManager.guildInfoMap.get(guildId)!=null){
|
||||
long createTime = GuilidManager.guildInfoMap.get(guildId).getCreateTime();
|
||||
if(createTime/1000>roundStartTime&&createTime/1000<roundEndTime){
|
||||
response.setType(-1);
|
||||
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
|
||||
}
|
||||
|
||||
|
|
@ -845,7 +854,7 @@ public class GuildFightLogic {
|
|||
.setRank(rank)
|
||||
.setAttackCount(RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_FIGHT_ATTACK_COUNT,"",String.valueOf(uid),Integer.class))
|
||||
.setUid(uid)
|
||||
.setHead(1)
|
||||
.setHead(playerInfo.getHead())
|
||||
.setHeadFrame(playerInfo.getHeadFrame())
|
||||
.setPosition(playerInfo.getGuildPosition())
|
||||
.setName(playerInfo.getName())
|
||||
|
|
|
|||
|
|
@ -348,15 +348,19 @@ public class PlayerLogic {
|
|||
|
||||
}
|
||||
|
||||
public void modifyHeadFrame(ISession session, int frameId,MessageTypeProto.MessageType messageType) throws Exception {
|
||||
LOGGER.info("头像框id{}",frameId);
|
||||
public void modifyHeadFrame(ISession session, int type,int headId,MessageTypeProto.MessageType messageType) throws Exception {
|
||||
LOGGER.info("头像框或头像id{}",headId);
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
ItemManager itemManager = user.getItemManager();
|
||||
if(itemManager.getItem(frameId)==null||itemManager.getItem(frameId).getItemNum()<1){
|
||||
if(itemManager.getItem(headId)==null||itemManager.getItem(headId).getItemNum()<1){
|
||||
MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"无此头像框");
|
||||
return;
|
||||
}
|
||||
user.getPlayerInfoManager().setHeadFrame(frameId);
|
||||
if(type==0){
|
||||
user.getPlayerInfoManager().setHeadFrame(headId);
|
||||
}else{
|
||||
user.getPlayerInfoManager().setHead(headId);
|
||||
}
|
||||
playerInfoUpdate(user);
|
||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);
|
||||
}
|
||||
|
|
@ -450,7 +454,7 @@ public class PlayerLogic {
|
|||
}
|
||||
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(1)
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(session.getUid());
|
||||
|
|
|
|||
|
|
@ -109,6 +109,8 @@ public class SGameSetting implements BaseConfig {
|
|||
|
||||
private int[] heroReturn;
|
||||
|
||||
private int defaultHead;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -313,4 +315,7 @@ public class SGameSetting implements BaseConfig {
|
|||
return equipSignUnlock;
|
||||
}
|
||||
|
||||
public int getDefaultHead() {
|
||||
return defaultHead;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue