From 4481b5a8c0248f80a7dabbd1c3995391adeec4b3 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 11 Sep 2019 10:10:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gm=20=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/globals/Global.java | 1 + .../com/ljsd/jieling/kefu/Cmd_sendmsg.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_sendmsg.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index 8c605ddbb..84172d694 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -59,4 +59,5 @@ public interface Global { int LUCKY_LUCK = 1; //吉运 int DILIGENT = 2; //勤勉 int LUCKCAT = 3; //招财猫 + int GMMSG = 4; //gm } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_sendmsg.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_sendmsg.java new file mode 100644 index 000000000..1ca6fa531 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_sendmsg.java @@ -0,0 +1,20 @@ +package com.ljsd.jieling.kefu; + +import com.ljsd.jieling.chat.logic.ChatLogic; +import com.ljsd.jieling.db.redis.RedisKey; +import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.network.server.ProtocolsManager; + +public class Cmd_sendmsg extends GmAbstract { + + @Override + public boolean exec(String[] args) throws Exception { + if (args.length != 1) { + return false; + } + String content = args[0]; + ChatLogic.getInstance().sendSysChatMessage(content, Global.GMMSG, 0, 0, 0, 0, 0, 0); + return true; + } +} From 521b7d062a256e83ff7fe41eb0ae1d9143e653fb Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 11 Sep 2019 10:51:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/equip/SoulEquipWearHandler.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipWearHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipWearHandler.java index d458a97fe..a083744cf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipWearHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/SoulEquipWearHandler.java @@ -19,6 +19,6 @@ public class SoulEquipWearHandler extends BaseHandler equipIdsList = equipWearRequest.getSoulEquipIdsList(); - HeroLogic.getInstance().wearSoulEquipOpt(iSession,equipWearRequest.getHeroId(),equipIdsList); + HeroLogic.getInstance().wearSoulEquipOpt(iSession,equipWearRequest.getHeroId(),equipIdsList,equipWearRequest.getType()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index f4e239307..0d3406786 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1432,7 +1432,7 @@ public class HeroLogic { // 安装魂印 - public void wearSoulEquipOpt(ISession session,String heroId, List equipIds) throws Exception { + public void wearSoulEquipOpt(ISession session,String heroId, List equipIds,int type) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); Hero hero = user.getHeroManager().getHeroMap().get(heroId); @@ -1453,7 +1453,7 @@ public class HeroLogic { if (null == cfg ) { throw new Exception("装备配置不存在" + equip.getCfgId()); } - if(equipIds.size()!=6){ + if(type!=1){ currentType.put(entry.getKey(),cfg.getType()); } }