From 080652853d9777082e1b0cc8fc9e1f473c37a159 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 4 Jul 2023 14:38:31 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 2b4b31e47..af142624e 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"5", - "tables":"" + "version":"6", + "tables":"GlobalActivity" } \ No newline at end of file From 67e048dc9fa8d1863038903f76c32523189d1d6e Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 4 Jul 2023 17:00:22 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index af142624e..2b4b31e47 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"6", - "tables":"GlobalActivity" + "version":"5", + "tables":"" } \ No newline at end of file From f5967110fe2f1c4102c7e06da165091fd2e0a4dc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 5 Jul 2023 16:23:28 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- conf/hotfix.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 2b4b31e47..9d4b25d94 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"5", - "tables":"" + "version":"9", + "tables":"GlobalActivity" } \ No newline at end of file diff --git a/conf/hotfix.json b/conf/hotfix.json index 5ae757c8d..4076ede21 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,6 @@ { - "version":"5", + "version":"6", "classes":[ + {"name":"RedisUtil.class","fullName":"com.ljsd.jieling.db.redis.RedisUtil"} ] } From 84c01899282aa623844d00fef63f090024abf257 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 12 Jul 2023 16:24:43 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- conf/hotfix.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 9d4b25d94..2b4b31e47 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"9", - "tables":"GlobalActivity" + "version":"5", + "tables":"" } \ No newline at end of file diff --git a/conf/hotfix.json b/conf/hotfix.json index 4076ede21..5ae757c8d 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,6 +1,5 @@ { - "version":"6", + "version":"5", "classes":[ - {"name":"RedisUtil.class","fullName":"com.ljsd.jieling.db.redis.RedisUtil"} ] } From 64105348b452229951ffbb85a616a6f1f09c6a9f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 12 Jul 2023 16:27:55 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=9D=92=E9=BE=99=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 ------- .../java/com/ljsd/jieling/logic/activity/ActivityType.java | 1 - .../src/main/java/com/ljsd/jieling/util/ToolsUtil.java | 4 ---- 3 files changed, 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 6c5c30cb3..f96ae7b40 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -177,13 +177,6 @@ public class ActivityLogic implements IEventHandler{ if(sGlobalActivity.getType() == ActivityType.DAILY_PREFERENTIAL_GIFT){ continue; } - if(sGlobalActivity.getType() == ActivityType.OPEN_TYPE_LONG &&!openActivityIds.contains(sGlobalActivity.getId())){ - openActivityIds.add(sGlobalActivity.getId()); - LOGGER.info("永久开活动-新青龙秘宝"); - continue; - } - - long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1); long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2); if (now < startTime) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 14b9ffa71..c8f3b33aa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -13,7 +13,6 @@ public interface ActivityType { int OPEN_TYPE_SERVER = 3; // 活动开启类型:开服时间 int OPEN_TYPE_MONTHS = 5 ; // 活动开启类型:开服自然月 - int OPEN_TYPE_LONG = 6; // 活动开启类型:一直开启 int WILL_TAKE = 0; //未领取 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java index e07af0bd5..4ccd64fc3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java @@ -39,10 +39,6 @@ public class ToolsUtil { } } break; - case ActivityType.OPEN_TYPE_LONG: - startTime = -1; - break; - default:break; } return startTime; } From 6a6e36faccfa975a8c19342c3110eb012b585d9e Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 13 Jul 2023 10:30:37 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/TreasureActivity.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java index 7559855aa..9a43409d9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java @@ -39,19 +39,15 @@ public class TreasureActivity extends AbstractActivity { public void onResume(User user) throws Exception { LOGGER.info("青龙秘宝日常刷新..."); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, id); - //戒灵秘宝改为青龙秘宝,只有周任务和月任务 2020.8.14 - //user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_REFRESH, id); } @Override public void initActivity(User user) throws Exception { - LOGGER.info("[青龙秘宝初始化] [uid:{}] activityId={}",user.getId(), id); if(user.getPlayerInfoManager().getHadBuyTreasure() == 1){ LOGGER.info("[青龙秘宝初始化] [重置秘宝解锁状态] [uid:{}]",user.getId()); user.getPlayerInfoManager().setHadBuyTreasure(0); } - reSetGood(user); SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_MONTH_REFRESH, sGlobalActivity.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, sGlobalActivity.getId()); @@ -93,7 +89,6 @@ public class TreasureActivity extends AbstractActivity { ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(activityId); int destState = getDestState(user); List dropList = new ArrayList<>(2); -// Set missionIds = new HashSet<>(); if (missionId == -2) { if (user.getPlayerInfoManager().getHadBuyTreasure() == 0) { throw new ErrorCodeException(ErrorCode.newDefineCode("请先解锁秘宝")); @@ -188,15 +183,6 @@ public class TreasureActivity extends AbstractActivity { getAllTreasureRewards(user, user.getActivityManager().getActivityMissionMap().get(id), getDestState(user), itemAttrs); } - public void reSetGood(User user){ - ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(5001); - if (bagInfo == null){ - return; - } - bagInfo.refresh(); - LOGGER.info("================青龙秘宝刷新===============,uid:{},id:{}",user.getId(),id); - } - /** * 通知客户端每周补给特权变动 * @param sesson From 497060fbd982762c30e1907a6214c2010ed55d19 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 13 Jul 2023 14:31:37 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/TreasureActivity.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java index 9a43409d9..4b9a8bde4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java @@ -44,10 +44,6 @@ public class TreasureActivity extends AbstractActivity { @Override public void initActivity(User user) throws Exception { LOGGER.info("[青龙秘宝初始化] [uid:{}] activityId={}",user.getId(), id); - if(user.getPlayerInfoManager().getHadBuyTreasure() == 1){ - LOGGER.info("[青龙秘宝初始化] [重置秘宝解锁状态] [uid:{}]",user.getId()); - user.getPlayerInfoManager().setHadBuyTreasure(0); - } SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_MONTH_REFRESH, sGlobalActivity.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.TREASH_WEEK_REFRESH, sGlobalActivity.getId()); From 5bf9973b8634e58408fadb94eb11fe377c105f62 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 13 Jul 2023 14:57:50 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/activity/ActivityType.java | 2 ++ .../java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java | 1 + 2 files changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index c8f3b33aa..83164437c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -135,6 +135,8 @@ public interface ActivityType { int DRAW_FABAO_LV_CHEST = 119;//抽卡等级宝箱 int TIAN_JIANG_GIFT = 120;//天降礼包 + int LINGLONG_BAOJING_TASK = 20014;//玲珑宝镜任务 + //***************************************bt活动=====================================// int BRUSH_PRIVILEGE = 103;//刷充特权 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 886937f68..7309ac17c 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 @@ -118,6 +118,7 @@ public enum ActivityTypeEnum { FABAO_BOOK_REWARD(ActivityType.FABAO_BOOK_REWARD,FabaoBookRewardActivity::new),//法宝图鉴宝箱 DRAW_FABAO_LV_CHEST(ActivityType.DRAW_FABAO_LV_CHEST,DrawLvChestActivity::new),//抽卡等级宝箱 TIAN_JIANG_GIFT(ActivityType.TIAN_JIANG_GIFT,DefaultEmptyActivity::new),//抽卡等级宝箱 + LINGLONG_BAOJING_TASK(ActivityType.LINGLONG_BAOJING_TASK, DefaultEmptyActivity::new),//玲珑宝镜任务 /****************************************************** bt **********************************************************/ BRUSH_PRIVILEGE(ActivityType.BRUSH_PRIVILEGE, BrushPrivilegeActivity::new),//刷充特权 From bd0217e13be1c534d6817ec196a78bd971a54fc0 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 14 Jul 2023 15:40:07 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=BF=83=E6=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 7 +------ tablemanager/src/main/java/config/SItem.java | 6 ++++++ 2 files changed, 7 insertions(+), 6 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 9a1e6ad5e..b20933d70 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 @@ -523,12 +523,7 @@ public class HeroLogic { // 查找物品 SItem sItem = SItem.getsItemMap().get(item[0]); // 非英雄奖励直接返回 - if (sItem.getItemType() != GlobalItemType.CARD) { - return item; - } - // 非五星英雄 - SCHero scHero = SCHero.getsCHero().get(item[0]); - if (scHero == null || scHero.getStar() < 5) { + if (sItem.getXinyuan() != 1) { return item; } diff --git a/tablemanager/src/main/java/config/SItem.java b/tablemanager/src/main/java/config/SItem.java index cd056b694..388663851 100644 --- a/tablemanager/src/main/java/config/SItem.java +++ b/tablemanager/src/main/java/config/SItem.java @@ -35,6 +35,8 @@ public class SItem implements BaseConfig { private int useLevel; private String name; + private int xinyuan; + @Override public void init() throws Exception { sItemMap = STableManager.getConfig(SItem.class); @@ -132,4 +134,8 @@ public class SItem implements BaseConfig { public int getUseLevel() { return useLevel; } + + public int getXinyuan() { + return xinyuan; + } } From 67fa585f1812fb77cfc9038d4ceecbcb0b633136 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 18 Jul 2023 15:13:18 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java | 1 + .../logic/store/newRechargeInfo/rechargeHandler/PushHandler.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java index 33af1db12..b3cd50540 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java @@ -14,6 +14,7 @@ public class PushWelfareBag extends AbstractWelfareBag { public PushWelfareBag(User user, SRechargeCommodityNewConfig config){ setModId(config.getId()); + setOpen(true); setStartTime(TimeUtils.now()); setEndTime(getStartTime() + getTime() * TimeUtils.HOUR); user.getPlayerInfoManager().getNewRechargeInfo().addPush(this); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java index c1a6bb980..538a4914f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java @@ -24,7 +24,6 @@ public class PushHandler extends AbstractRechargeHandler { boolean result = super.refreshStatus(user, rechargeId); AbstractWelfareBag bag = getBag(user, rechargeId); if(bag.isOpen()){ - SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(rechargeId); long now = TimeUtils.now(); // 结束时间到 if(bag.getEndTime() != 0 && now > bag.getEndTime()){ From 3aab5ee06243f8268e5b0e340c3746d3838aefdc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 18 Jul 2023 15:49:16 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 7 +++++-- .../store/newRechargeInfo/rechargeHandler/PushHandler.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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 9319f0e4f..8f7854c9f 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 @@ -88,6 +88,9 @@ public class BuyGoodsNewLogic { // 没有礼包先新增礼包 if(!rechargeHandler.rechargeIsInBag(user,entry.getKey())){ AbstractWelfareBag bag = rechargeHandler.initUnitWF(user, config); + if (bag == null){ + continue; + } rechargeHandler.addNew(user,bag); } // 刷新 @@ -1009,12 +1012,12 @@ public class BuyGoodsNewLogic { * @param user * @return */ - public static boolean createPushBag(int bagId,User user) throws Exception { + public static boolean createPushBag(int bagId,User user) { SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId); RechargeHandler handler = getRechargeHandler(config.getOtype()); PushWelfareBag pushBag = (PushWelfareBag) handler.getBag(user, bagId); if (pushBag == null){ - pushBag = (PushWelfareBag) handler.initUnitWF(user, config); + pushBag = new PushWelfareBag(user, config); } return pushBag.isBuy(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java index 538a4914f..887e26110 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java @@ -48,7 +48,7 @@ public class PushHandler extends AbstractRechargeHandler { @Override public AbstractWelfareBag initUnitWF(User user, SRechargeCommodityNewConfig config) { - return new PushWelfareBag(user,config); + return null; } @Override From 78142836f216318b15ab7912d4f980edcab65d85 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 21 Jul 2023 17:54:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=BF=83=E6=84=BF?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b20933d70..03be761bb 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 @@ -438,7 +438,7 @@ public class HeroLogic { } //记录卡池抽奖次数 - heroManager.putRandomType(type, num + result[1]); + heroManager.putRandomType(type, num + 1); int[] rewardArr = new int[result.length]; System.arraycopy(result, 0, rewardArr, 0, result.length); return rewardArr; From 66f04a7b46ebfc822b7cc7ea672791c89f62d9d8 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 21 Jul 2023 18:46:38 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=BF=83=E6=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store/newRechargeInfo/bean/PushWelfareBag.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java index b3cd50540..68014ad17 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java @@ -29,10 +29,6 @@ public class PushWelfareBag extends AbstractWelfareBag { } } - public int getLimit() { - return NewRechargeInfo.FIVESTARLIMIT; - } - private int getTime(){ int i = 2; for(int[] s : getCondition()){ From c49ae44705d010ad9a839261a413638260dcaabb Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 19 Jul 2023 15:26:04 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/GetPlayerInfoHandler.java | 17 +++++++------ .../ljsd/jieling/logic/dao/HeroManager.java | 22 ++++------------ .../ljsd/jieling/logic/hero/HeroLogic.java | 25 +++++++++++++------ 3 files changed, 32 insertions(+), 32 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 33c812e93..e817de206 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -131,11 +131,6 @@ public class GetPlayerInfoHandler extends BaseHandler{ .setState(user.getPlayerInfoManager().getPhoneBindInfo().getState()) .build(); HeroManager heroManager = user.getHeroManager(); - int alreadyCount =0; - for(Integer id : STableManager.getFigureConfig(HeroStaticConfig.class).getRandomHeroIds()){ - int count = Optional.ofNullable(heroManager.getTotalCount().get(id)).orElse(0); - alreadyCount+=count; - } // 返利 GmActivityLogic.zeroUpdateGmActivity(user); SGameSetting setting = STableManager.getConfig(SGameSetting.class).get(1); @@ -170,7 +165,15 @@ public class GetPlayerInfoHandler extends BaseHandler{ Set equipHandBookSet = user.getEquipManager().getEquipHandBook().keySet(); int equipPool = user.getEquipManager().getSoulEquipPool(); int vipPrivilageValue = user.getPlayerInfoManager().getVipPrivilageValue(SMazeTreasureSetting.sMazeTreasureSetting.getRefreshVIP()); - int randomCount = SLotterySpecialConfig.getLotteryListByDifferentType(7).iterator().next().getCount()- user.getHeroManager().getRandomPoolByType().getOrDefault(11,new HashMap<>()).getOrDefault(7,0); + // 英雄抽卡剩余必中 + int randomCount = SLotterySpecialConfig.getLotteryListByDifferentType(7) + .iterator().next().getCount() - + user.getHeroManager().getRandomPoolByType().getOrDefault(11,new HashMap<>()).getOrDefault(7,0); + // 法宝抽卡剩余必中 + int fabaoRandomCount = SLotterySpecialConfig.getLotteryListByDifferentType(151) + .iterator().next().getCount() - + user.getHeroManager().getRandomPoolByType().getOrDefault(23,new HashMap<>()).getOrDefault(151,0); + List sixiangxinfaInfos = getSixiangxinfaInfos(heroManager); List practiceSkillInfos = getPracticeSkillInfos(heroManager); List faBaoSoulInfos = getFaBaoSoulInfos(heroManager); @@ -186,7 +189,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .addAllVipLeveTake(playerInfoManager.getHadTakeLevelBoxVip()) .setUserCreateTime((int)(playerInfoManager.getCreateTime()/1000)) .addAllRedType(playerInfoManager.getReds()) - .setRandCount(alreadyCount) + .setRandCount(fabaoRandomCount) .addAllHeroHandBook(heroHandBookList).addAllEquipHandBook(equipHandBookSet) .addAllGoodsTypeDuration(goodsTypeDurations) .setHadBuyTreasure(playerInfoManager.getHadBuyTreasure()) 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 7943a4eda..8d27080b6 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 @@ -23,8 +23,11 @@ public class HeroManager extends MongoBase { */ private Map heroMap= new HashMap<>(); - private Map totalCount= new HashMap<>(); - + /** + * key:MergePool + * key:DifferentType + * value:数量 + */ private Map> randomPoolByType = new HashMap<>(); private Map mustRandomCount= new HashMap<>(); @@ -313,12 +316,6 @@ public class HeroManager extends MongoBase { updateString("likableSendTime", _sendTime); } - - public void updateRandCount(int type, int count){ - updateString("totalCount." + type, count); - totalCount.put(type,count); - } - public void updateRandomPoolByType(int type,Map map){ randomPoolByType.put(type,map); updateString("randomPoolByType." + type, map); @@ -386,10 +383,6 @@ public class HeroManager extends MongoBase { return heroMap; } - public Map getTotalCount() { - return totalCount; - } - public void addHeroHandBook(int heroId,int star){ if(heroHandBook.containsKey(heroId)&&heroHandBook.get(heroId)>=star){ return; @@ -597,11 +590,6 @@ public class HeroManager extends MongoBase { // return purpleMansionSeal; 2022-4-20 策划需求关闭紫府神印功能 } - public void setPurpleMansionSeal(Map purpleMansionSeal) { - this.purpleMansionSeal = purpleMansionSeal; - updateString("purpleMansionSeal", purpleMansionSeal); - } - public void putPurpleMansionSeal(PurpleMansionSeal seal) { purpleMansionSeal.put(seal.getSealId(),seal); updateString("purpleMansionSeal", purpleMansionSeal); 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 03be761bb..a9f062e97 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 @@ -255,6 +255,9 @@ public class HeroLogic { throw new ErrorCodeException("已抽取今日最大次数"); } HeroManager heroManager = user.getHeroManager(); + if (heroManager == null){ + throw new ErrorCodeException("玩家信息异常"); + } if (type == 11 && heroManager.getFirstTenth() == 0) { heroManager.updateFirstTenth(); } @@ -269,7 +272,7 @@ public class HeroLogic { throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } } - if (heroManager != null && heroManager.getHeroMap() != null) { + if (heroManager.getHeroMap() != null) { //只有抽英雄才校验 if (sLotterySetting.getGainType() == 1 && heroManager.getHeroMap().size() + perCount > STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getHeroNumlimit()) { throw new ErrorCodeException(ErrorCode.HERO_MAX); @@ -347,16 +350,23 @@ public class HeroLogic { } Poster.getPoster().dispatchEvent(new RandomCardEvent(user.getId(), sLotterySetting.getActivityId(), heroManager.getRandomPoolByType().get(sLotterySetting.getMergePool()), sLotterySetting.getPerCount())); -// //1群英招募 HeroInfoProto.HeroRandResponse.Builder builder = HeroInfoProto.HeroRandResponse.newBuilder(); + // 英雄卡池类型 if (sLotterySetting.getLotteryType() == 1) { Poster.getPoster().dispatchEvent(new HeroRandomEvent(uid, perCount)); - List lotteryListByDifferentType = SLotterySpecialConfig.getLotteryListByDifferentType(7); - if (lotteryListByDifferentType.size() == 1) { - SLotterySpecialConfig next = lotteryListByDifferentType.iterator().next(); - builder.setMustCount(next.getCount() - heroManager.getRandomPoolByType().get(sLotterySetting.getMergePool()).getOrDefault(7, 0)); - } + int heroRandomCount = SLotterySpecialConfig.getLotteryListByDifferentType(7) + .iterator().next().getCount() - + user.getHeroManager().getRandomPoolByType().getOrDefault(11,new HashMap<>()).getOrDefault(7,0); + builder.setMustCount(heroRandomCount); } + // 法宝卡池类型 + if (sLotterySetting.getLotteryType() == 4){ + int fabaoRandomCount = SLotterySpecialConfig.getLotteryListByDifferentType(151) + .iterator().next().getCount() - + user.getHeroManager().getRandomPoolByType().getOrDefault(23,new HashMap<>()).getOrDefault(151,0); + builder.setFabaoMustCount(fabaoRandomCount); + } + user.getUserMissionManager().onGameEvent(user, GameEvent.RANDOM_HERO, sLotterySetting.getLotteryType(), perCount); if (sLotterySetting.getLotteryType() == 11) { //只记录新将招募次数 @@ -365,7 +375,6 @@ public class HeroLogic { if (sLotterySetting.getActivityId() == 8201) { Poster.getPoster().dispatchEvent(new UserLevelEvent(user.getId(), 0)); } - heroManager.updateRandCount(type, perCount); CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, resultRandom, BIReason.HERO_RANDOM); fiveStarPushByRandom(user, resultRandom); fiveStarPokemonPushByRandom(user, resultRandom);