From a2ac1eaf28d44aab20c069e6bdf3df115f291b42 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 16 Oct 2019 11:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E9=A9=AC=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/chat/logic/ChatLogic.java | 8 +++++--- .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 11 ++++++++--- tablemanager/src/main/java/config/SSpecialConfig.java | 6 +++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java index c74aa929c..403f46d5d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java @@ -180,11 +180,13 @@ public class ChatLogic { /** - * 系统消息跑马灯 + * 系统消息 + * @param multiple 跑马灯次数 0 不显示 */ - public void sendSysChatMessage(String message,int messageType ,int itemId, int type,int startTime, int endTime, int priorityLevel, int frequency) { + public void sendSysChatMessage(String message,int messageType ,int itemId, int type,int startTime, int endTime, int priorityLevel, int multiple) { long messageId = RedisUtil.getInstence().increment(GameApplication.serverId + RedisKey.CHAT_SYS_MSG_ID+ GameApplication.serverId); - ChatProto.ChatInfo chatInfo = CBean2Proto.getSysChatInfoBuilder(message,messageType,itemId ,type,startTime,endTime,priorityLevel,frequency,messageId); + ChatProto.ChatInfo chatInfo = CBean2Proto.getSysChatInfoBuilder(message,messageType,itemId ,type,startTime,endTime,priorityLevel,multiple,messageId); MessageCache.addSystemMsg(chatInfo,messageId); } + } 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 80863a816..972f3cc66 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -15,6 +15,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.protocols.*; import config.SMainLevelConfig; import config.SMonsterConfig; +import config.SSpecialConfig; import manager.STableManager; import util.StringUtil; import util.TimeUtils; @@ -279,7 +280,7 @@ public class CBean2Proto { return chatInfo.build(); } - public static ChatProto.ChatInfo getSysChatInfoBuilder(String message,int messageType,int itemId,int type,int startTime, int endTime, int priorityLevel, int frequency,long messageId) { + public static ChatProto.ChatInfo getSysChatInfoBuilder(String message,int messageType,int itemId,int type,int startTime, int endTime, int priorityLevel, int multiple,long messageId) { ChatProto.ChatInfo.Builder chatInfo = ChatProto.ChatInfo.newBuilder(); chatInfo.setItemId(itemId); chatInfo.setMessageId(messageId); @@ -287,14 +288,18 @@ public class CBean2Proto { chatInfo.setMsg(message); chatInfo.setType(type); chatInfo.setMessageType(messageType); - if (type == 1){ + if (multiple > 0 ){ chatInfo.setStartTime(startTime); chatInfo.setEndTime(endTime); chatInfo.setPriorityLevel(priorityLevel); - chatInfo.setFrequency(frequency); + chatInfo.setFrequency(0); + chatInfo.setSpeed(SSpecialConfig.getIntegerValue(SSpecialConfig.LAMP_TEXT_SPEED)); + chatInfo.setMultiple(multiple); } return chatInfo.build(); } + + public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception { User user = UserManager.getUser(friendId); PlayerManager playerInfoManager = user.getPlayerInfoManager(); diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index 279214590..f90b5929a 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -7,6 +7,9 @@ import util.StringUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +/** + * 常量表 + */ @Table(name = "SpecialConfig") public class SSpecialConfig implements BaseConfig { private static Map enumers; @@ -45,7 +48,8 @@ public class SSpecialConfig implements BaseConfig { public static final String SUNLONG_DAILYTASKS = "Sunlong_DailyTasks";//孙龙的宝藏每日、每周、每月任务个数 public static final String SUNLONG_COST = "Sunlong_Cost";//孙龙的宝藏购买等级 public static final String SUNLONG_INTEGRAL = "Sunlong_Integral";//孙龙的宝藏每日积分礼包 - public static final String SUNLONG_REWARD = "Sunlong_Reward";//孙龙的宝藏礼包 + public static final String SUNLONG_REWARD = "Sunlong_Reward";//孙龙的宝藏礼包\ + public static final String LAMP_TEXT_SPEED = "lamp_text_speed";//跑马灯速度 @Override public void init() throws Exception {