From 5b660609f4cbb3a8ec3e7faab95652e47dcbe3b9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" Date: Thu, 1 Oct 2020 00:23:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/db/redis/RedisUtil.java | 12 ++++++++++ .../jieling/logic/activity/ActivityLogic.java | 2 ++ .../jieling/logic/activity/SheJiActivity.java | 24 ++++++++++++------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index f1970448e..467fce676 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1308,4 +1308,16 @@ public class RedisUtil { } + public void remove(String key){ + + for (int i = 0; i < MAX_TRY_TIMES; i++) { + try { + redisTemplate.delete(key); + return; + } catch (Exception e) { + + } + } + } + } 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 c55ffa330..68746d945 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 @@ -176,6 +176,8 @@ public class ActivityLogic implements IEventHandler{ if (null == abstractActivity) { continue; } + if(openActivityIds.contains(sGlobalActivity.getId())) + continue; abstractActivity.onActivityStart(); openActivityIds.add(sGlobalActivity.getId()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java index 66987f54d..06e214ffb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java @@ -71,21 +71,27 @@ class SheJiActivity extends AbstractActivity { } } + + //删除本榜单 + String key = RedisUtil.getInstence().getKey(RedisKey.EXPERT_RANK, Integer.toString(id)); + String key2 = RedisUtil.getInstence().getKey(RedisKey.GUILD_SHEJI_SCORE_RANK, Integer.toString(id)); + RedisUtil.getInstence().remove(key); + RedisUtil.getInstence().remove(key2); } @Override public void initActivity(User user) throws Exception { super.initActivity(user); //初始化移除道具 - SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); - if (null != sGodSacrificeSetting) { - if (sGodSacrificeSetting.getItemDelete() == 1) { - int[] activityItems = sGodSacrificeSetting.getActivityItems(); - for (int item : activityItems) { - user.getItemManager().removeItem(item); - } - } - } +// SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); +// if (null != sGodSacrificeSetting) { +// if (sGodSacrificeSetting.getItemDelete() == 1) { +// int[] activityItems = sGodSacrificeSetting.getActivityItems(); +// for (int item : activityItems) { +// user.getItemManager().removeItem(item); +// } +// } +// } } From b3222d42b352ed1db41ea86ca99ba5cd7d607564 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 21:27:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/config/SRechargeCommodityConfig.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java index 3549586b2..7b9842b68 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityConfig.java @@ -240,10 +240,6 @@ public class SRechargeCommodityConfig implements BaseConfig { return dailyUpdate; } - public int[] getPassiveSkill() { - return passiveSkill; - } - public static TreeMap getRecharegeHeroTime() { return recharegeHeroTime; } From 8ee35244fb93181bbdc20f19baf9bd7c634867fd Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 21:30:25 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E4=B8=8A=E4=B8=AA=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/FightDataUtil.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 f0ad6e17e..954561721 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -145,14 +145,12 @@ public class FightDataUtil { if(sPassiveSkillLogicConfig.getEffectiveRange()!=1){ continue; } - detail.rawset(1,LuaValue.valueOf(sPassiveSkillLogicConfig.getId())); - detail.rawset(2, LuaValue.valueOf(sPassiveSkillLogicConfig.getJudge())); - detail.rawset(3, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); + detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); List effectList = parseArraayToLuaValues(sPassiveSkillLogicConfig.getValue()); int size = effectList.size(); if (size > 0) { for (int j = 0; j < size; j++) { - detail.rawset(j + 4, effectList.get(j)); + detail.rawset(j + 2, effectList.get(j)); } } passivityData.rawset(passivityIndex,detail); From 452b92905302792c8e92d42b93a22c6926ea3771 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 23 Nov 2020 21:34:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E5=90=88=E6=88=90?= =?UTF-8?q?=E6=89=93=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/equip/ComplexJewelEquipRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java index 08f2c466f..65d3e343d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java @@ -223,7 +223,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler(consumeMap.values()),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); + ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),builder.toString(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0); } From 4dd8ad89d90b1bbea9ae3790b5d8a699f0a6697d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 24 Nov 2020 13:49:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81?= =?UTF-8?q?=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java | 3 +++ .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index 24e298bfa..5330dee06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -86,11 +86,14 @@ public enum ReportEventEnum { BEAST_LEVEL(59,"beast_level",new CommonEventHandler(),new String[]{"beast_id","old_level","new_level","cost_item_list_info"}), BEAST_STAR(60,"beast_star",new CommonEventHandler(),new String[]{"beast_id","old_star","new_star","cost_item_list","cost_beast_list"}), BEAST_SUMMON(61,"beast_summon",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}), + BEAST_CABINET(62,"beast_cabinet",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}), + VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""}); + private int type; private String eventName; 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 8c9676e5e..58b6ce0e7 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 @@ -415,6 +415,10 @@ public class HeroLogic{ case 9: eventEnum = ReportEventEnum.BEAST_SUMMON; break; + case 10: + eventEnum = ReportEventEnum.BEAST_CABINET; + activityId = sLotterySetting.getActivityId(); + break; default: break; From 4419d44283e1248a5db7be6138ec0ee0ac62dbf4 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 24 Nov 2020 14:05:32 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E6=8A=A5=E7=A9=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/ktbeans/ReportUserEvent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java index 36bfaf75a..ce1b85741 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java @@ -17,19 +17,19 @@ public class ReportUserEvent { private Map> userProperties; public ReportUserEvent setAccount_id(String accountId){ - baseInfo.put("#account_id",accountId); + baseInfo.put("#account_id",accountId==null?"unknown":accountId); return this; } public ReportUserEvent setDistinct_id(String distinct_id){ - baseInfo.put("#distinct_id",distinct_id); + baseInfo.put("#distinct_id",distinct_id==null?"unknown":distinct_id); return this; } public ReportUserEvent setDevice_id(String device_id){ - baseInfo.put("#device_id",device_id); + baseInfo.put("#device_id",device_id==null?"unknown":device_id); return this; } public ReportUserEvent setIp(String ip){ - baseInfo.put("#ip",ip); + baseInfo.put("#ip",ip==null?"unknown":ip); return this; } public ReportUserEvent setCountry_code(int country_code){ From b5b616016a2720a063011edbaf37c56d9e59b278 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 25 Nov 2020 11:03:16 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/FightDataUtil.java | 6 ++++-- 1 file changed, 4 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 954561721..f0ad6e17e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -145,12 +145,14 @@ public class FightDataUtil { if(sPassiveSkillLogicConfig.getEffectiveRange()!=1){ continue; } - detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); + detail.rawset(1,LuaValue.valueOf(sPassiveSkillLogicConfig.getId())); + detail.rawset(2, LuaValue.valueOf(sPassiveSkillLogicConfig.getJudge())); + detail.rawset(3, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); List effectList = parseArraayToLuaValues(sPassiveSkillLogicConfig.getValue()); int size = effectList.size(); if (size > 0) { for (int j = 0; j < size; j++) { - detail.rawset(j + 2, effectList.get(j)); + detail.rawset(j + 4, effectList.get(j)); } } passivityData.rawset(passivityIndex,detail); From 1c3102157dd52a3fec4bc0a73845322cbf9730c0 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 26 Nov 2020 11:13:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=89=A9=E5=93=81=E6=8E=89?= =?UTF-8?q?=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/globals/BIReason.java | 3 +++ .../handler/arena/ArenaChallengeHandler.java | 14 +++++++++---- .../ljsd/jieling/logic/arena/ArenaLogic.java | 20 ++++++++++++++++++- 3 files changed, 32 insertions(+), 5 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 fb16b7d59..c9c843df9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -159,6 +159,9 @@ public interface BIReason { int SKIN_USE_REWARD = 90;//激活皮肤获得头像 int SUB_ACTIVITY_FINISH = 91;//易经宝库活动结束补发 + int ARENA_WIN_REWARD = 92;//竞技场胜利奖励 + int ARENA_LOSE_REWARD = 93;//竞技场失败奖励 + int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级 int SECRETBOX_CONSUME = 1001;//秘盒抽卡 int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java index be68f7c6e..b2bd67b11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java @@ -90,8 +90,11 @@ public class ArenaChallengeHandler extends BaseHandler0) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 2058d1f19..f858210b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -552,6 +552,24 @@ public class ArenaLogic { } - + /** + * 竞技场战斗胜利/失败奖励掉落 + * @param user + * @param fightResult + * @return + * @throws Exception + */ + public CommonProto.Drop.Builder getArenaReward(User user, int fightResult) throws Exception { + // 获取配置文件 + SArenaSetting sArenaSetting = SArenaSetting.getSArenaSetting(); + // 三元 赢家奖励:输家奖励 + int rewardGroupId = fightResult == 1?sArenaSetting.getBattleWinReward():sArenaSetting.getBattleLoseReward(); + // 三元 赢家标记:输家标记 + int reason = fightResult == 1?BIReason.ARENA_WIN_REWARD:BIReason.ARENA_LOSE_REWARD; + int[] dropList = new int[1]; + dropList[0]=rewardGroupId; + CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, reason); + return drop; + } }