From 678bb38395c6ab2a36d69c216686b9a213100244 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 17 Sep 2019 11:22:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E6=98=9F=E7=BA=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java index 9096aabd4..bc3445882 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.dao; +import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.util.KeyGenUtils; import com.ljsd.jieling.util.UUIDEnum; @@ -12,7 +13,8 @@ public class EspecialEquip extends PropertyItem { super(); super.setId(KeyGenUtils.produceIdByModule(UUIDEnum.ESPECIAL_EQUIP, uid)); super.setEquipId(equipTid); - this.star = 3; + SItem item = SItem.getsItemMap().get(equipTid); + this.star = item.getQuantity(); } public EspecialEquip() { this.setRootCollection(User._COLLECTION_NAME); From 0dfd959d5e369848445cdd60205993dc081b09db Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 17 Sep 2019 14:05:16 +0800 Subject: [PATCH 2/2] delete buy indicaiton --- .../com/ljsd/jieling/globals/BIReason.java | 2 ++ .../handler/room/RoomMatchRequestHandler.java | 4 +++ .../jieling/logic/store/BuyGoodsLogic.java | 32 +++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 3a6f553e6..ca4470082 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -82,6 +82,8 @@ public interface BIReason { int ENDLESS_REASON_CHANGE = 50;//无尽副本赛季更换 int RANDOM_SOULEQUIP = 51;//占星 + int DIRECT_BUY = 52; // 直购 + //道具消耗原因 1000开头 int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java index 59d00cfcd..44d4c1554 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java @@ -74,6 +74,10 @@ public class RoomMatchRequestHandler extends BaseHandler{ return ; } User user = UserManager.getUser(iSession.getUid()); + if( !user.getTeamPosManager().getTeamPosForHero().containsKey(GlobalsDef.BLOODY_TEAM)){ + MessageUtil.sendErrorResponse(iSession,0,responseMsgId,"未设置编队"); + return; + } snapUserFightInfo(user); RedisUtil.getInstence().set(RedisKey.MATCH_UID_KEY + ":" + uid,gson.toJson("1")); List matchAddressInfos = RedisUtil.getInstence().getAllSetToList(RedisKey.MATCH_SERVER_INFO + ":" + GameApplication.areaId, String.class); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index dd85b72e4..d51d7ac67 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.store; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.VipPrivilegeType; +import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; @@ -45,7 +46,7 @@ public class BuyGoodsLogic { return; } MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TEST_BUY_GIGT_GOODS_RESPONSE_VALUE,null,true); - Result result = sendGoods(uid, goodsId, "gm-test", "111111", System.currentTimeMillis(), -1); + Result result = sendGoods(uid, goodsId, "gm-test", "111111", System.currentTimeMillis(), -999); User user = UserManager.getUser(uid); int price =sRechargeCommodityConfig.getPrice(); int isDiscount = sRechargeCommodityConfig.getIsDiscount(); @@ -190,22 +191,35 @@ public class BuyGoodsLogic { buyGoodsTimes.put(goodsId,buyCount); rechargeInfo.setBuyGoodsTimes(buyGoodsTimes); - //妖精 - String title = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_title"); - String content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt"); - if(type== 3 || type==1 || type==6){ - content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt",new Object[]{rewardStr.split("#")[1]}); + //直购礼包 + if(type == GiftGoodsType.DIRECTBAG){ + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sRechargeCommodityConfig.getBaseReward(), BIReason.DIRECT_BUY); + ISession session = OnlineUserManager.getSessionByUid(uid); + if(session!=null){ + PlayerInfoProto.DirectBuyIndication build = PlayerInfoProto.DirectBuyIndication.newBuilder().setDrop(drop).build(); + MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.DIRECT_BUY_GOODS_INDICATION_VALUE,build,true); + } + }else{ + String title = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt"); + if(type== 3 || type==1 || type==6){ + content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt",new Object[]{rewardStr.split("#")[1]}); + } + MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr,nowTime, Global.MAIL_EFFECTIVE_TIME); } - MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr,nowTime, Global.MAIL_EFFECTIVE_TIME); + resultRes.setResultCode(1); KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,resultRes.getResultCode(),price); - notifyPaySuccessFul(uid,goodsId); + notifyPaySuccessFul(uid,goodsId,amount != -999); return resultRes; } //通知前端充值成功 - public static void notifyPaySuccessFul(int uid,int goodsId){ + public static void notifyPaySuccessFul(int uid,int goodsId,boolean needNotify){ + if(!needNotify){ + return; + } ISession session = OnlineUserManager.getSessionByUid(uid); if(session!=null){ PlayerInfoProto.NotifyPaySuccessfulIndicaiton build = PlayerInfoProto.NotifyPaySuccessfulIndicaiton.newBuilder().setGoodsId(goodsId).build();