Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
16cbf1c5ef
|
@ -59,4 +59,5 @@ public interface Global {
|
|||
int LUCKY_LUCK = 1; //吉运
|
||||
int DILIGENT = 2; //勤勉
|
||||
int LUCKCAT = 3; //招财猫
|
||||
int GMMSG = 4; //gm
|
||||
}
|
||||
|
|
|
@ -19,6 +19,6 @@ public class SoulEquipWearHandler extends BaseHandler<HeroInfoProto.SoulEquipWea
|
|||
@Override
|
||||
public void processWithProto(ISession iSession, HeroInfoProto.SoulEquipWearRequest equipWearRequest) throws Exception {
|
||||
List<HeroInfoProto.SoulEquipPos> equipIdsList = equipWearRequest.getSoulEquipIdsList();
|
||||
HeroLogic.getInstance().wearSoulEquipOpt(iSession,equipWearRequest.getHeroId(),equipIdsList);
|
||||
HeroLogic.getInstance().wearSoulEquipOpt(iSession,equipWearRequest.getHeroId(),equipIdsList,equipWearRequest.getType());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -1432,7 +1432,7 @@ public class HeroLogic {
|
|||
|
||||
|
||||
// 安装魂印
|
||||
public void wearSoulEquipOpt(ISession session,String heroId, List<HeroInfoProto.SoulEquipPos> equipIds) throws Exception {
|
||||
public void wearSoulEquipOpt(ISession session,String heroId, List<HeroInfoProto.SoulEquipPos> 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());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue