From e4aec66ae1a09d75580cfbaf9f4123e2a297d575 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 17:46:20 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index ad5e07f57..3c51b6934 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -336,12 +336,12 @@ public class MinuteTask extends Thread { } //bug 修复 - if(w==4){ + /*if(w==4){ if(hour ==10 && minute ==50){ LOGGER.error("lingmaimijing0 000000"); CrossLingmaiLogic.getInstance().fixBug(); } - } + }*/ } } } From 3b091987e9970fd1d30da6881b432bdf51dbada0 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 18:37:14 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= =?UTF-8?q?=E7=A7=98=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index 7eff9f92c..c13ee58a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -213,6 +213,7 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler Date: Thu, 25 Nov 2021 19:17:21 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrossLingmaiSecretAreaBattleHandler.java | 20 ++++++++++++++----- .../logic/arena/CrossLingmaiLogic.java | 5 ++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index c13ee58a4..65d062e24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -190,12 +190,14 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); @@ -203,21 +205,29 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler0){ - lingMaiSecretArea.setScore1((int) disappearScore); + Map lingMaiMap = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.class, LingMaiSecretArea.class); + if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()!=uid)){ + lingMaiSecretArea.setScore1((int) disappearScore); + } } return lingMaiSecretArea; } From 7a6e9b1a2651197df2ad1a8db7c885e42c499d30 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 19:25:33 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java index 30413e1da..4b50ea88f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java @@ -56,7 +56,7 @@ public class CrossLingmaiLogic { lingMaiSecretArea.setBeginOccupyTime(TimeUtils.nowInt()); if(disappearScore>0){ Map lingMaiMap = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.class, LingMaiSecretArea.class); - if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()!=uid)){ + if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()==uid)){ lingMaiSecretArea.setScore1((int) disappearScore); } } From ce85c5e94f17a059576493c487a8ea46838e1ffc Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 20:42:11 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrossLingmaiSecretAreaBattleHandler.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index 65d062e24..10cb87c0f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -118,6 +118,7 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler Date: Thu, 25 Nov 2021 11:02:27 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossServer/CrossLingmaiSecretAreaBattleHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index 10cb87c0f..9046d819b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -210,8 +210,8 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); - second =((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60) >60 ? - 60 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60); + second =((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60) >60 ? + 60 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60); LOGGER.info("uid:"+uid+"pvp owner occupy id:"+myLingmaiId+" minute:"+minute+"second:"+second); tempScore =(second*config.getRewardList()[0][1]/60); score1 = myLingmai.getScore1()+minute*config.getRewardList()[0][1]+(int)tempScore; From 15f2f5d6ed85b5339cdea6fe8c6107e7fc457022 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 11:09:12 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossServer/CrossLingmaiSecretAreaBattleHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index 9046d819b..1008e465b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -147,6 +147,13 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler0){ + lingMaiSecretArea.setScore1((int) disappearScore); + } + } RedisUtil.getInstence().putMapEntry(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.valueOf(id), lingMaiSecretArea); } res.setResult(fightResult.getResult()); From 3c85141eabe64d59c9d1e0e85967631443d04d45 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 26 Nov 2021 10:34:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=A4=9A=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 10 ++++++---- .../activity/LimitRandomSpecialMonsterActivityNew.java | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 4910e998b..a406b44e0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -279,16 +279,18 @@ public class GetPlayerInfoHandler extends BaseHandler{ */ private void finalActivityReset(User user){ Map missionMap = user.getActivityManager().getActivityMissionMap(); + int choiceDrawId = 20012; + int specialMonsterId = 14501; // 限时招募 - ActivityMission mission = missionMap.get(20012); + ActivityMission mission = missionMap.get(choiceDrawId); if (mission != null){ - ChoiceDrawCardActivity activity = (ChoiceDrawCardActivity)ActivityTypeEnum.getActicityType(20012); + ChoiceDrawCardActivity activity = (ChoiceDrawCardActivity)ActivityTypeEnum.getActicityType(choiceDrawId); activity.checkResetProgress(user,mission); } // 灵兽招募 - ActivityMission mission2 = missionMap.get(14501); + ActivityMission mission2 = missionMap.get(specialMonsterId); if (mission2 != null){ - LimitRandomSpecialMonsterActivityNew activity = (LimitRandomSpecialMonsterActivityNew)ActivityTypeEnum.getActicityType(14501); + LimitRandomSpecialMonsterActivityNew activity = (LimitRandomSpecialMonsterActivityNew)ActivityTypeEnum.getActicityType(specialMonsterId); activity.checkResetProgress(user,mission2); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java index a71378f81..e460bb29a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java @@ -151,7 +151,6 @@ public class LimitRandomSpecialMonsterActivityNew extends LimitRandomCardActivit mission.getActivityMissionMap().put(0, progressInfo); mission.setOpenType(1); - mission.setV(0); mission.setActivityState(ActivityType.OPEN_STATE); } } From 7709b634fde5f2eecc42b7c7dd5a564e420c6922 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 2 Dec 2021 17:35:25 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=20=E5=A4=A9=E5=9C=B0=E6=B4=AA=E7=82=89?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=84=9A=E6=9C=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/GetTrumpSelectItemHandler.java | 40 ++++++++++++++++ .../TrumpGachaSelectItemRequestHandler.java | 46 +++++++++++++++++++ .../logic/activity/ActivityTypeEnum.java | 1 + .../LimitRandomSpecialMonsterActivityNew.java | 2 +- .../ljsd/jieling/logic/dao/HeroManager.java | 15 ++++++ .../ljsd/jieling/logic/hero/HeroLogic.java | 32 ++++++++++++- .../ljsd/jieling/logic/mission/GameEvent.java | 1 + 7 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetTrumpSelectItemHandler.java create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetTrumpSelectItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetTrumpSelectItemHandler.java new file mode 100644 index 000000000..030cbbd25 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetTrumpSelectItemHandler.java @@ -0,0 +1,40 @@ +package com.ljsd.jieling.handler.activity; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.activity.activityLogic.WeekCardLogic; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.MessageUtil; +import rpc.protocols.ActivityProto; +import rpc.protocols.CommonProto; +import rpc.protocols.MessageTypeProto; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class GetTrumpSelectItemHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.GET_TRUMP_SELECT_ITEM_REQUEST; + } + + /** + * 获取天地洪炉抽奖选择up道具协议 + * @param session + * @param proto + * @throws Exception + */ + @Override + public void processWithProto(ISession session, ActivityProto.GetTrumpSelectItemRequest proto) throws Exception{ + ActivityProto.GetTrumpSelectItemResponse.Builder builder = ActivityProto.GetTrumpSelectItemResponse.newBuilder(); + User user = UserManager.getUser(session.getUid()); + ListselectList=new ArrayList<>(); + for (Map.Entry entry : user.getHeroManager().getTrumpSelectItemMap().entrySet()) { + selectList.add(entry.getValue()); + } + builder.addAllSelectIds(selectList); + MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.GET_TRUMP_SELECT_ITEM_RESPONSE_VALUE, builder.build(), true); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java new file mode 100644 index 000000000..ea7460388 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java @@ -0,0 +1,46 @@ +package com.ljsd.jieling.handler.activity; + +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.jbean.ActivityMission; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.util.MessageUtil; +import org.springframework.stereotype.Component; +import rpc.protocols.ActivityProto; +import rpc.protocols.MessageTypeProto; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author lvxinran + * @date 2020/11/11 + * @discribe + */ +@Component +public class TrumpGachaSelectItemRequestHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.TRUMP_GACHA_SELECT_ITEM_REQUEST; + } + + @Override + public void processWithProto(ISession iSession, ActivityProto.TrumpGachaSelectItemRequest proto) throws Exception { + User user = UserManager.getUser(iSession.getUid()); + Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); + ActivityMission activityMission = activityMissionMap.get(proto.getActivityId()); + if(activityMission==null){ + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } + HashMap map = new HashMap<>(); + for (int i = 0; i < proto.getSelectIdsList().size(); i++) { + map.put(i+1,proto.getSelectIdsList().get(i)); + } + user.getHeroManager().setTrumpSelectItemMap(map); + MessageUtil.sendMessage(iSession,1,MessageTypeProto.MessageType.TRUMP_GACHA_SELECT_ITEM_RESPONSE_VALUE,null,true); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index ca67d3d8b..86ec55453 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -88,6 +88,7 @@ public enum ActivityTypeEnum { LING_LONG_PAVILION(ActivityType.LING_LONG_PAVILION,DefaultEmptyActivity::new), RIDING_SWARD(ActivityType.RIDING_SWARD,RidingSwardActivity::new), ITEMS_STORE_NEW(ActivityType.ITEMS_STORE_NEW,SuperBoxActivity::new), + TRUMP_GACHA_ACTIVITY(ActivityType.TRUMP_GACHA_ACTIVITY,LimitRandomCardActivity::new), ; private int type; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java index e460bb29a..2afc05e3f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LimitRandomSpecialMonsterActivityNew.java @@ -159,7 +159,7 @@ public class LimitRandomSpecialMonsterActivityNew extends LimitRandomCardActivit * 检查活动是否完成或者可以领取 * @param uid * @param activityId - * @param activityMission4 + * @param activityMission * @return */ @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java index ae56e5846..3212829b0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java @@ -94,6 +94,10 @@ public class HeroManager extends MongoBase { */ private HashMap beautyBagCardInfoMap = new HashMap<>(); + /** + * 天地洪炉-许愿道具 + */ + private HashMap trumpSelectItemMap = new HashMap<>(); /** * 抽奖次数记录 * key: 招募类型 value: 次数 @@ -601,6 +605,17 @@ public class HeroManager extends MongoBase { this.beautyBagCardInfoMap = beautyBagCardInfoMap; updateString("beautyBagCardInfoMap", beautyBagCardInfoMap); } + + public HashMap getTrumpSelectItemMap() { + return trumpSelectItemMap; + } + + public void setTrumpSelectItemMap(HashMap trumpSelectItemMap) { + this.trumpSelectItemMap = trumpSelectItemMap; + updateString("trumpSelectItemMap", trumpSelectItemMap); + } + + public void putBeautyBagCardInfoMap(Integer key,Integer val) { this.beautyBagCardInfoMap.put(key,val); updateString("beautyBagCardInfoMap", beautyBagCardInfoMap); 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 d3558c2f5..f7c990a63 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 @@ -422,7 +422,10 @@ public class HeroLogic { } else if (sLotterySetting.getLotteryType() == 3 && isActivityBeautyBag(sLotterySetting.getActivityId())) {//乾坤宝盒-许愿魂印 result = BeautyBagDrawCard(user, sLotteryRewardConfig); - } else { + }else if(isActivityByIdAndType(sLotterySetting.getActivityId(),ActivityType.TRUMP_GACHA_ACTIVITY)){ + result = TrumpGachaDrawCard(user, sLotteryRewardConfig); + } + else { result = reward; } //活动抽奖计数 @@ -432,6 +435,9 @@ public class HeroLogic { } else if (isActivityByIdAndType(sLotterySetting.getActivityId(), ActivityType.SPECIAL_MONSTER_RANDOM_ACTIVITY)) { //灵兽招募 计次数 user.getUserMissionManager().onGameEvent(user, GameEvent.SOUL_RECRUIT, 1); + }else if(isActivityByIdAndType(sLotterySetting.getActivityId(),ActivityType.TRUMP_GACHA_ACTIVITY)){ + //天地洪炉抽奖 计次数 + user.getUserMissionManager().onGameEvent(user, GameEvent.TRUMP_GACHA, 1); } //记录卡池抽奖次数 heroManager.putRandomType(type, num + result[1]); @@ -466,6 +472,30 @@ public class HeroLogic { return result; } + ///天地洪炉抽奖处理 + private int[] TrumpGachaDrawCard(User user, SLotteryRewardConfig sLotteryRewardConfig) { + int count = 4; + List list = SLotteryRewardConfig.getSLotteryRewardConfigListByPoolId(sLotteryRewardConfig.getPool()); + if (list == null) { + return sLotteryRewardConfig.getReward(); + } + + int index = list.indexOf(sLotteryRewardConfig); + if (index >= count) { + return sLotteryRewardConfig.getReward(); + } + + if (!user.getHeroManager().getTrumpSelectItemMap().containsKey(index + 1)) { + return sLotteryRewardConfig.getReward(); + } + + int[] result = new int[2]; + result[0] = user.getHeroManager().getTrumpSelectItemMap().get(index + 1); + result[1] = sLotteryRewardConfig.getReward()[1]; + LOGGER.info("天地洪炉抽到了UP---->" + sLotteryRewardConfig.getReward()[0] + "替换为---->" + result[0]); + return result; + } + private boolean isActivityBeautyBag(int activityId) { SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(activityId); if (activity == null) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java index 2a43a8341..7a6eaa15d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java @@ -137,5 +137,6 @@ public enum GameEvent { DAILY_CHALLENGE_COUNT,//日常副本挑战次数 HARSTAGE_PARTICIPATION_REWARD,//山河社稷图参与奖励 NEW_HERO_ZHAOMU,//新将招募次数 + TRUMP_GACHA,//天地洪炉 } From aab210369800a22f969f83207d5367245acc0c78 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <490717040@qq.com> Date: Thu, 9 Dec 2021 02:36:39 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 --- 1 file changed, 3 deletions(-) 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 d3558c2f5..646b23f9b 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 @@ -2308,9 +2308,6 @@ public class HeroLogic { public void getPracticeSkill(List infoList, Map practiceSkillMap, long maxForce,int sex,int userLv,List tfInfoList) { - if (practiceSkillMap.isEmpty()) { - return; - } StringBuilder skillStr = new StringBuilder(); // 修行技能 for (Map.Entry entry : practiceSkillMap.entrySet()) { From 9873a26fffc5ab7d9258a12feda8d5f85ab72423 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <490717040@qq.com> Date: Thu, 9 Dec 2021 15:19:21 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=BA=AB=E5=A4=96=E5=8C=96=E8=BA=AB?= =?UTF-8?q?=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/FightDataUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index 94251aa95..bd704e3a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -268,14 +268,14 @@ public class FightDataUtil { for (int i = 0; i < pokemonUnitList.size(); i++) { CommonProto.FightUnitInfo unitInfo=pokemonUnitList.get(i); String skillId = unitInfo.getUnitSkillIds(); - if(skillId.equals("0")||skillId==""){ + if(skillId.equals("0")|| StringUtil.isEmpty(skillId)){ continue; } ///100代表是修行技能 if (unitInfo.getPosition()==100){ LuaValue monster = new LuaTable(); monster.set("id",0); - monster.set("star",0); + monster.set("star",unitInfo.getStar()); monster.set("teamDamage",unitInfo.getForceScore()); monster.set("camp",camp); monster.set("position",unitInfo.getPosition());