From a520fb0a75eea618b7bc0c65630289f0dceea289 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 3 Nov 2022 17:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/store/BuyStoreItemHandler.java | 6 ++--- .../ljsd/jieling/logic/hero/HeroLogic.java | 2 -- .../jieling/logic/store/BuyGoodsNewLogic.java | 2 +- .../ljsd/jieling/logic/store/StoreLogic.java | 25 ++----------------- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/store/BuyStoreItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/store/BuyStoreItemHandler.java index abf0a6a67..bf436f9cf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/store/BuyStoreItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/store/BuyStoreItemHandler.java @@ -13,6 +13,7 @@ import rpc.protocols.MessageTypeProto; import rpc.protocols.PlayerInfoProto; import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; +import util.TimeUtils; @Component public class BuyStoreItemHandler extends BaseHandler { @@ -24,8 +25,7 @@ public class BuyStoreItemHandler extends BaseHandler { @Override public void process(ISession iSession, PacketNetData netData) throws Exception { - PlayerInfoProto.BuyStoreItemRequest buyStoreItemRequest - = PlayerInfoProto.BuyStoreItemRequest.parseFrom(netData.parseClientProtoNetData()); + PlayerInfoProto.BuyStoreItemRequest buyStoreItemRequest = PlayerInfoProto.BuyStoreItemRequest.parseFrom(netData.parseClientProtoNetData()); CommonProto.Drop drop = StoreLogic.buyStoreItem(iSession.getUid(), buyStoreItemRequest.getStoreId(), buyStoreItemRequest.getItemId(), buyStoreItemRequest.getItemNum()); if (buyStoreItemRequest.getItemId()==1106){ Poster.getPoster().dispatchEvent(new NewWelfareEvent(UserManager.getUser(iSession.getUid()), NewWelfareTypeEnum.BUY_1106.getType(),0)); @@ -33,8 +33,8 @@ public class BuyStoreItemHandler extends BaseHandler { if (buyStoreItemRequest.getItemId()==1107){ Poster.getPoster().dispatchEvent(new NewWelfareEvent(UserManager.getUser(iSession.getUid()), NewWelfareTypeEnum.BUY_1107.getType(),0)); } - int msgId = MessageTypeProto.MessageType.BUY_STORE_ITEM_RESPONSE_VALUE; PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build(); + int msgId = MessageTypeProto.MessageType.BUY_STORE_ITEM_RESPONSE_VALUE; MessageUtil.sendMessage(iSession, 1,msgId, builder, true); } } 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 332d5dfbc..75af74a7a 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 @@ -3593,8 +3593,6 @@ public class HeroLogic { //新版穿装备 private boolean checkEquipForWear(Hero hero, User user, List equipIds, Map equipInfos) throws Exception { - - if (equipIds == null || equipIds.isEmpty()) { return false; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 889f4a885..dd4afd736 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -575,7 +575,7 @@ public class BuyGoodsNewLogic { public static void addNewPrivilege(User user ,int privilege,PlayerInfoProto.PrivilegeIndication.Builder indication) throws Exception { int privilegeType = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilege).getPrivilegeType(); if(privilegeType == VipPrivilegeType.ADVENTURE_BASE_REWARD){ - CombatLogic.getInstance().getNewAdventureReward(user,true,(int)(TimeUtils.now()/1000)); + CombatLogic.getInstance().getNewAdventureReward(user,true,TimeUtils.nowInt()); } user.getPlayerInfoManager().addVipInfo(privilege); VipInfo vipInfo = user.getPlayerInfoManager().getVipInfo().get(privilege); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index 26802d754..d35127e38 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -507,12 +507,8 @@ public class StoreLogic implements IEventHandler { if(extraAdd!=null && extraAdd.length>0){ for(int[] extra : extraAdd){ int type = extra[0]; - if(type == 1){ -// SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.sPlayerLevelConfigMap.get(user.getPlayerInfoManager().getLevel()); -// add += sPlayerLevelConfig.getExtraAdd(); - }else if(type == 2){ + if(type == 2){ int addPrivageId = extra[1]; -// PlayerLogic.getInstance().getMaxCountByPrivilegeType(user,addPrivageId); add = PlayerLogic.getInstance().getMaxCountByPrivilegeType(user,addPrivageId); } } @@ -531,13 +527,6 @@ public class StoreLogic implements IEventHandler { levelAdd = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(user.getPlayerInfoManager().getLevel()).getGoldExtraNum3(); } } -// if (levelAdd > 0) { -// Map map = SPrivilegeTypeConfig.conditionMap.get(GlobalsDef.VIP_UNLOCK_PRIVILEGE).get(VipPrivilegeType.SHOP_DIAN_JING); -// Integer orDefault = map.getOrDefault(user.getPlayerInfoManager().getVipLevel(), 0); -// if (orDefault != null && orDefault != 0) { -// add += orDefault; -// } -// } dropItems[i][1] = ((goods[i][1] + levelAdd) * itemNum * (add / 1000)) / 10; } CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.STORE_BUY_ITEM); @@ -550,7 +539,6 @@ public class StoreLogic implements IEventHandler { if(storeId==Global.GODSTORID){ Poster.getPoster().dispatchEvent(new GoldEvent(user.getId(),itemNum)); } - if(storeId==Global.VIPSTORID){ int vipLeve = user.getPlayerInfoManager().getVipLevel(); user.getPlayerInfoManager().setHadTakeLevelBoxVip(vipLeve); @@ -561,18 +549,9 @@ public class StoreLogic implements IEventHandler { for(int i=0;i