From 164a3cb45fbc0f8adf07103fd51c05b7399d5d98 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 17 Oct 2019 01:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/bloody/UserBloodySnpInfo.java | 6 +++--- .../com/ljsd/jieling/handler/map/MapLogic.java | 6 +++--- .../GetMonsterAttackRankHandler.java | 2 +- .../handler/player/ModifyHeadFrameHandler.java | 15 +++++++++------ .../jieling/logic/activity/ActivityLogic.java | 4 ++-- .../com/ljsd/jieling/logic/arena/ArenaLogic.java | 6 +++--- .../ljsd/jieling/logic/dao/PlayerInfoCache.java | 6 +++--- .../com/ljsd/jieling/logic/dao/PlayerManager.java | 6 +++--- .../com/ljsd/jieling/logic/dao/UserManager.java | 3 ++- .../jieling/logic/family/GuildFightLogic.java | 11 ++++++++++- .../ljsd/jieling/logic/player/PlayerLogic.java | 14 +++++++++----- .../src/main/java/config/SGameSetting.java | 5 +++++ 12 files changed, 53 insertions(+), 31 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java index 06db748fd..dc322c1ed 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java @@ -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; } 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 2bdb87117..547dd8c70 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 @@ -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) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java index fae5f6db2..3aa970c1c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java @@ -46,7 +46,7 @@ public class GetMonsterAttackRankHandler extends BaseHandler { @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); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index aa73ede32..84c173e51 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -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); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index acc83d694..885a23c26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -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(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerInfoCache.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerInfoCache.java index b9309b8eb..8b310be36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerInfoCache.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerInfoCache.java @@ -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; } 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 a6fdcef2c..1a2870a5b 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 @@ -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; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 3d24d2709..15fd0ad51 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -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); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 9526d7510..388c84b36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -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