From ba3123906c3ce935a0c6b8fc03655b1e41340027 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 26 Sep 2023 14:19:32 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A4=BC=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/item/ItemLogic.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 52455083b..1b3af71d1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -524,10 +524,10 @@ public class ItemLogic { //卸下魂印装备 Map equipByPositionMap = hero.getEquipByPositionMap(); Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); - if (equipByPositionMap != null && equipByPositionMap.size() > 0) { + if (equipByPositionMap != null && !equipByPositionMap.isEmpty()) { equipByPositionMap.forEach((k, v) -> baseItemMap.put(v, baseItemMap.getOrDefault(v, 0L) + 1)); } - if (soulEquipByPositionMap != null && soulEquipByPositionMap.size() > 0) { + if (soulEquipByPositionMap != null && !soulEquipByPositionMap.isEmpty()) { soulEquipByPositionMap.forEach((k, v) -> baseItemMap.put(v, baseItemMap.getOrDefault(v, 0L) + 1)); } //卸下宝物 @@ -554,7 +554,13 @@ public class ItemLogic { user.getEquipManager().unloadFaxiang(key); } } - + // 礼物装备 + Set giftEquipList = hero.getHeroGiftEquipList(); + if (giftEquipList != null && !giftEquipList.isEmpty()){ + for (Integer id : giftEquipList) { + baseItemMap.put(id,1L); + } + } heroIdReport.add(hero.getTemplateId()); heroLevelReport.add(hero.getOriginalLevel()); From e3ac93946011a886759480cf67094f42f9b9bd33 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 26 Sep 2023 15:17:04 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- conf/hotfix.json | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 4499a95c8..2b4b31e47 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"7", - "tables":"GlobalActivity" + "version":"5", + "tables":"" } \ No newline at end of file diff --git a/conf/hotfix.json b/conf/hotfix.json index e6728e6bf..2e5c7ac7a 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,9 +1,5 @@ { - "version":"12", + "version":"5", "classes":[ - {"name":"ItemUtil.class","fullName":"com.ljsd.jieling.util.ItemUtil"}, - {"name":"GetPlayerInfoHandler.class","fullName":"com.ljsd.jieling.handler.GetPlayerInfoHandler"}, - {"name":"ItemLogic.class","fullName":"com.ljsd.jieling.logic.item.ItemLogic"}, - {"name":"Cmd_general.class","fullName":"com.ljsd.jieling.kefu.Cmd_general"} ] } \ No newline at end of file From 30cdab855bfe54b3cbf1ca4e09568dd1e96a17d7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 26 Sep 2023 18:06:34 +0800 Subject: [PATCH 03/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E8=A1=A8?= 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..b16bbcbaa 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"5", - "tables":"" + "version":"6", + "tables":"BlessingRewardPoolNew|ItemConfig|RewardGroup|RewardItemConfig" } \ No newline at end of file From 21daa05e51b2441329e2be1e3180777613b532f2 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 26 Sep 2023 18:10:39 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E9=87=8D=E7=BD=AE?= 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 b16bbcbaa..2b4b31e47 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"6", - "tables":"BlessingRewardPoolNew|ItemConfig|RewardGroup|RewardItemConfig" + "version":"5", + "tables":"" } \ No newline at end of file From a6aaa6d28b46e73fbc38bef11fead5377fb0d545 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 26 Sep 2023 20:57:27 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/hotfix.json | 3 +- .../ljsd/jieling/logic/item/ItemLogic.java | 106 +++++++++--------- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/conf/hotfix.json b/conf/hotfix.json index 2e5c7ac7a..d2f637b15 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,6 @@ { - "version":"5", + "version":"6", "classes":[ + {"name":"ItemLogic.class","fullName":"com.ljsd.jieling.logic.item.ItemLogic"} ] } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 1b3af71d1..e71e9c45a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -1046,59 +1046,59 @@ public class ItemLogic { */ public void checkItem(User user) throws ErrorCodeException { //检查白金魂印是否异常 - Item item1 = user.getItemManager().getItem(81147); - if(item1 != null){ - if(item1.getItemNum() >=10000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item1.getItemId(),item1.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } - //检查神装升星碎片是否异常 - Item item2 = user.getItemManager().getItem(81247); - if(item2 != null){ - if(item2.getItemNum() >=100000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item2.getItemId(),item2.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } - //检查神1自选箱是否异常 - Item item3 = user.getItemManager().getItem(33003); - if(item3 != null){ - if(item3.getItemNum() >=10000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item3.getItemId(),item3.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } - //检查神2自选箱是否异常 - Item item4 = user.getItemManager().getItem(33004); - if(item4 != null){ - if(item4.getItemNum() >=10000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item4.getItemId(),item4.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } - //检查极品传说自选箱是否异常 - Item item5 = user.getItemManager().getItem(81182); - if(item5 != null){ - if(item5.getItemNum() >=10000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item5.getItemId(),item5.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } - //检查红色魂印自选箱是否异常 - Item item6 = user.getItemManager().getItem(81129); - if(item6 != null){ - if(item6.getItemNum() >=10000){ - String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item6.getItemId(),item6.getItemNum()); - LOGGER.error(format); - throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); - } - } +// Item item1 = user.getItemManager().getItem(81147); +// if(item1 != null){ +// if(item1.getItemNum() >=10000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item1.getItemId(),item1.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } +// //检查神装升星碎片是否异常 +// Item item2 = user.getItemManager().getItem(81247); +// if(item2 != null){ +// if(item2.getItemNum() >=100000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item2.getItemId(),item2.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } +// //检查神1自选箱是否异常 +// Item item3 = user.getItemManager().getItem(33003); +// if(item3 != null){ +// if(item3.getItemNum() >=10000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item3.getItemId(),item3.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } +// //检查神2自选箱是否异常 +// Item item4 = user.getItemManager().getItem(33004); +// if(item4 != null){ +// if(item4.getItemNum() >=10000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item4.getItemId(),item4.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } +// //检查极品传说自选箱是否异常 +// Item item5 = user.getItemManager().getItem(81182); +// if(item5 != null){ +// if(item5.getItemNum() >=10000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item5.getItemId(),item5.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } +// //检查红色魂印自选箱是否异常 +// Item item6 = user.getItemManager().getItem(81129); +// if(item6 != null){ +// if(item6.getItemNum() >=10000){ +// String format = MessageFormat.format("道具异常,uid:{0},itemId:{1},itemNum:{2}", user.getId(), item6.getItemId(),item6.getItemNum()); +// LOGGER.error(format); +// throw new ErrorCodeException(ErrorCode.ACCOUNT_ERROR); +// } +// } // Item item7 = user.getItemManager().getItem(1004); // if(item7 != null){ // if(item7.getItemNum() >= 300 && user.getId() != 10009366){ From 6ed51d7c84461a06ea212202b15646e470929fae Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 16 Oct 2023 10:55:43 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=EF=BC=9A=E7=AD=96?= =?UTF-8?q?=E5=88=92=E8=A1=A8?= 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 402130f11e9675cfea561c71ba0ab535691ffc8a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 19 Oct 2023 16:00:18 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E7=83=AD=E6=9B=B4=EF=BC=9A=E7=AD=96?= =?UTF-8?q?=E5=88=92=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index af142624e..4499a95c8 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"6", + "version":"7", "tables":"GlobalActivity" } \ No newline at end of file From 443ad0aba714421513b9316252ea0f6e256d2bd3 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Sat, 28 Oct 2023 18:16:09 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 4499a95c8..7da862d29 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"7", + "version":"8", "tables":"GlobalActivity" } \ No newline at end of file From 47cf2b227b3784bf88442a782cbf31e8938e272c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 30 Oct 2023 18:37:53 +0800 Subject: [PATCH 09/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 7da862d29..9d4b25d94 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"8", + "version":"9", "tables":"GlobalActivity" } \ No newline at end of file From 7af6e53e76561311ab9db52f2363bf6cc60282de Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 3 Nov 2023 11:06:02 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 9d4b25d94..ac0c434f1 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"9", + "version":"10", "tables":"GlobalActivity" } \ No newline at end of file From 7acad94334170ed928980ef9ade4c751e6a3ad6b Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 8 Nov 2023 15:17:52 +0800 Subject: [PATCH 11/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index ac0c434f1..6ef938c48 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"10", + "version":"11", "tables":"GlobalActivity" } \ No newline at end of file From 572e5c39c18a01abbfbfd8f35d654f684bc73566 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 14 Nov 2023 16:24:11 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 6ef938c48..f0414e17b 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"11", + "version":"12", "tables":"GlobalActivity" } \ No newline at end of file From d925924aca882bd6344f99fa9f256f388a3fa0fc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 20 Nov 2023 15:20:58 +0800 Subject: [PATCH 13/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/c_database_version.json | 4 ++-- conf/hotfix.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index f0414e17b..2b4b31e47 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"12", - "tables":"GlobalActivity" + "version":"5", + "tables":"" } \ No newline at end of file diff --git a/conf/hotfix.json b/conf/hotfix.json index d2f637b15..9f7fc801a 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,6 +1,6 @@ { - "version":"6", + "version":"5", "classes":[ - {"name":"ItemLogic.class","fullName":"com.ljsd.jieling.logic.item.ItemLogic"} + {"name":""} ] } \ No newline at end of file From da1193558958b51874f8e93211e2505a3ee17166 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 20 Nov 2023 15:22:05 +0800 Subject: [PATCH 14/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/hotfix.json | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/hotfix.json b/conf/hotfix.json index 9f7fc801a..2e5c7ac7a 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,6 +1,5 @@ { "version":"5", "classes":[ - {"name":""} ] } \ No newline at end of file From e2e510dd655a89effa4723db3928d6d9b51ead90 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 28 Nov 2023 10:13:08 +0800 Subject: [PATCH 15/32] =?UTF-8?q?=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 ++- ...GetWorldArenaRecordInfoRequestHandler.java | 24 +++++++++---------- 3 files changed, 15 insertions(+), 16 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 diff --git a/conf/hotfix.json b/conf/hotfix.json index 2e5c7ac7a..444a9c747 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,6 @@ { - "version":"5", + "version":"6", "classes":[ + {"name":"GetWorldArenaRecordInfoRequestHandler.class","fullName":"com.ljsd.jieling.handler.gtw.GetWorldArenaRecordInfoRequestHandler"} ] } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java index c9d7126e0..8ac2db902 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java @@ -34,7 +34,7 @@ public class GetWorldArenaRecordInfoRequestHandler extends BaseHandler result = RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), String.class, byte[].class); - if (result != null && !result.isEmpty()) { +// LOGGER.info("罗浮战斗记录个人数量,uid:{},num:{}",iSession.getUid(), result.values().size()); List< byte[]> arenaRecordList = new ArrayList<>(result.values()); List collect = arenaRecordList.stream().map(bytes -> { try { @@ -64,27 +64,25 @@ public class GetWorldArenaRecordInfoRequestHandler extends BaseHandler wroldBattleRecord1 != null ? wroldBattleRecord1.getAttackTime() : 0)).collect(Collectors.toList()); Collections.reverse(collect); int size = arenaRecordList.size(); +// LOGGER.info("罗浮战斗记录个人数量2,uid:{},num:{}",iSession.getUid(), size); if (size > 15) { - String[] removeMapKeys = new String[size - 15]; +// String[] removeMapKeys = new String[size - 15]; + ArrayList list = new ArrayList<>(size - 15); +// LOGGER.info("罗浮战斗记录删除数组长度,uid:{},num:{}",iSession.getUid(), size - 15); for (int i = 0; i < size - 15; i++) { WorldProto.WroldBattleRecord remove = collect.remove(size-i-1); - String removeId = remove.getRecordId(); - removeMapKeys[i] = (removeId); +// removeMapKeys[i] = remove.getRecordId(); + list.add(remove.getRecordId()); } - RedisUtil.getInstence().removeMapEntrys(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), (Object) removeMapKeys); + RedisUtil.getInstence().removeMapEntrys(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), list.toArray()); +// LOGGER.info("罗浮战斗记录删除数组,uid:{},num:{}, num2:{}",iSession.getUid(), removeMapKeys, collect.size()); } builder.addAllWroldBattleRecord(collect); } - +// LOGGER.info("罗浮战斗记录结果,uid:{},num:{}",iSession.getUid(), RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), String.class, byte[].class).size()); MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GetWorldArenaRecordInfoResponse.getNumber(),builder.build(),true); - -// //转发到world服 -// boolean b = WorldHelper.sendMessageToWord(iSession.getUid(),proto); -// if(!b){ -// throw new ErrorCodeException(ErrorCode.UNKNOWN); -// } } } From 0cab0056e5b5df36b51606e5ebb8caefe826f468 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 6 Dec 2023 15:04:33 +0800 Subject: [PATCH 16/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index af142624e..4499a95c8 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"6", + "version":"7", "tables":"GlobalActivity" } \ No newline at end of file From 0bc3cf6743bc71d5f7f2b18097639e0c1cba732a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 13 Dec 2023 13:40:32 +0800 Subject: [PATCH 17/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 4499a95c8..7da862d29 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"7", + "version":"8", "tables":"GlobalActivity" } \ No newline at end of file From 46432d820be8cb096ce50272e343a8dede4a5c35 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Sun, 24 Dec 2023 09:43:00 +0800 Subject: [PATCH 18/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 7da862d29..9d4b25d94 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"8", + "version":"9", "tables":"GlobalActivity" } \ No newline at end of file From de51a1551a87629edcc285c9186382e7fb88faeb Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 28 Dec 2023 10:38:17 +0800 Subject: [PATCH 19/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 9d4b25d94..ac0c434f1 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"9", + "version":"10", "tables":"GlobalActivity" } \ No newline at end of file From fe9ac5d1b6a408690c72b1e1721da401aaa7b922 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Wed, 3 Jan 2024 15:23:06 +0800 Subject: [PATCH 20/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index ac0c434f1..6ef938c48 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"10", + "version":"11", "tables":"GlobalActivity" } \ No newline at end of file From 3fcdc2f2792d65376cb7ef89bbc7b5b67ae47e12 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 8 Jan 2024 10:46:44 +0800 Subject: [PATCH 21/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 6ef938c48..f0414e17b 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"11", + "version":"12", "tables":"GlobalActivity" } \ No newline at end of file From 7b7c5550c62bd7dace7c23ee6806dfc12b234722 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 8 Jan 2024 10:55:11 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index f0414e17b..e872e120c 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { "version":"12", - "tables":"GlobalActivity" + "tables":"GlobalActivity|TreasureTaskConfig" } \ No newline at end of file From e7c7458568331a766e2654feeb4117a34a89c099 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 11 Jan 2024 15:03:59 +0800 Subject: [PATCH 23/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index e872e120c..df56adbac 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"12", + "version":"13", "tables":"GlobalActivity|TreasureTaskConfig" } \ No newline at end of file From 28420b4ae8f96c0cefe65fc4cffab16dba6a8422 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 16 Jan 2024 10:22:53 +0800 Subject: [PATCH 24/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index df56adbac..02b8d4b83 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"13", + "version":"14", "tables":"GlobalActivity|TreasureTaskConfig" } \ No newline at end of file From 402cdf3c99f29618b33bf83e33370468fe58c26a Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Sat, 20 Jan 2024 17:42:54 +0800 Subject: [PATCH 25/32] =?UTF-8?q?=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 02b8d4b83..89e752f07 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"14", - "tables":"GlobalActivity|TreasureTaskConfig" + "version":"15", + "tables":"GlobalActivity|TreasureTaskConfig|ItemConfig" } \ No newline at end of file From c5c10b4703070d9bdefe61b3fe1f7e03379ecb7b Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 25 Jan 2024 10:51:04 +0800 Subject: [PATCH 26/32] =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 89e752f07..ed0aa7339 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"15", + "version":"16", "tables":"GlobalActivity|TreasureTaskConfig|ItemConfig" } \ No newline at end of file From 88cd6a2d43a505b3e9e2ae390bc9372a1c878035 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 29 Jan 2024 14:31:29 +0800 Subject: [PATCH 27/32] =?UTF-8?q?=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6f0a8cda79fd6360dc67f0fb2d6f9f5dbd2fa2df) --- .../jieling/logic/dao/UserMissionManager.java | 29 ++++++++++++++++--- .../event/CowFlySkyRefreshEventProcess.java | 2 ++ .../JadeDynastyWeekRefreshEventProcess.java | 2 -- .../mission/main/CowFlySkyMissionType.java | 28 ++++++++++++------ 4 files changed, 46 insertions(+), 15 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 673d45d27..a2aefcfb4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -76,6 +76,7 @@ public class UserMissionManager extends MongoBase { private CumulationData jadeDynastyCumulationData = new CumulationData();//破阵诛仙日数据 private CumulationData jadeDynastyWeekCumulationData = new CumulationData();//破阵诛仙周数据 private CumulationData mistyTripCumulationData = new CumulationData();//缥缈之旅数据 + private CumulationData cowFlyCumulationData = new CumulationData();//牛气冲天数据 /** * 奖励处理任务 @@ -103,7 +104,7 @@ public class UserMissionManager extends MongoBase { case DAILY_MISSION_REWARD:{ dailyMissionIdsType.rewardMission(user,(int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION)); if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){ - calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]); + calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap, parm[0]); updateString("dailyMissionIdsType",dailyMissionIdsType); } } @@ -212,6 +213,20 @@ public class UserMissionManager extends MongoBase { } } } + + // 牛气冲天活动数据处理 + if(!cowFlySkyMissionType.getDoingMissionIds().isEmpty()){ + Map flyMap = SArroGantFly.getTaskTypeMap().get(missionType.getMissionTypeValue()); + if (flyMap != null && !flyMap.isEmpty()) { + CumulationData.Result result = cowFlyCumulationData.updateData(missionType, parm); + if(result != null){ + cowFlySkyMissionType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.COWFLYSKYMISSION), cowFlyCumulationData); + setCowFlySkyMissionType(cowFlySkyMissionType); + setCowFlyCumulationData(cowFlyCumulationData); + } + } + } + if(!treasureMissionIdsType.getDoingMissionIds().isEmpty() ){ List sTreasureTaskConfigs = STreasureSunlongTaskConfig.sTreasureTaskConfigListByTypeMapTmp.get(missionType.getMissionTypeValue()); if(sTreasureTaskConfigs!=null){ @@ -319,9 +334,6 @@ public class UserMissionManager extends MongoBase { // vip任务 vipMissionIdsType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.VIPMISSION),cumulationData); updateString("vipMissionIdsType",vipMissionIdsType); - // 牛气冲天任务 - cowFlySkyMissionType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.COWFLYSKYMISSION),cumulationData); - updateString("cowFlySkyMissionType",cowFlySkyMissionType); // 家园任务 homeMissionType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.HOME_MISSION),cumulationData); updateString("homeMissionType",homeMissionType); @@ -450,6 +462,15 @@ public class UserMissionManager extends MongoBase { updateString("treasureMissionIdsType", treasureMissionIdsType); } + public CumulationData getCowFlyCumulationData() { + return cowFlyCumulationData; + } + + public void setCowFlyCumulationData(CumulationData cowFlyCumulationData) { + this.cowFlyCumulationData = cowFlyCumulationData; + updateString("cowFlyCumulationData", cowFlyCumulationData); + } + public TreasureMissionType getTreasureMissionIdsType() { return treasureMissionIdsType; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyRefreshEventProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyRefreshEventProcess.java index d34d2fbc6..7e59d8b2d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyRefreshEventProcess.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyRefreshEventProcess.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.mission.event; +import com.ljsd.jieling.logic.dao.CumulationData; import com.ljsd.jieling.logic.dao.UserMissionManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.GameEvent; @@ -25,6 +26,7 @@ public class CowFlySkyRefreshEventProcess implements BaseGameEventProcessor { cowFlySkyMissionType.getFinishMissionIds().clear(); cowFlySkyMissionType.getRewardedMissionIds().clear(); cowFlySkyMissionType.getDoingMissionIds().addAll(arro); + missionManager.setCowFlyCumulationData(new CumulationData()); missionManager.setCowFlySkyMissionType(cowFlySkyMissionType); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyWeekRefreshEventProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyWeekRefreshEventProcess.java index 0098a0500..4a7ebb1f6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyWeekRefreshEventProcess.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyWeekRefreshEventProcess.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.logic.mission.event; -import com.ljsd.jieling.logic.dao.UserMissionManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.GameMisionType; @@ -13,7 +12,6 @@ import java.util.Map; public class JadeDynastyWeekRefreshEventProcess implements BaseGameEventProcessor { @Override public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - UserMissionManager missionManager = user.getUserMissionManager(); //当前轮次破阵诛仙的活动ID int jadeAid = (int) parm[0]; MissionLogic.getInstance().resetJadeDynastyTaskInfo(user,2, jadeAid, misionTypeListMap); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/CowFlySkyMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/CowFlySkyMissionType.java index 101fa4d3e..f937178a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/CowFlySkyMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/CowFlySkyMissionType.java @@ -51,15 +51,9 @@ public class CowFlySkyMissionType extends AbstractMissionType { } } - @Override - public void calCumulationDataResult(User user, CumulationData.Result result, List missionStateChangeInfos, CumulationData cumulationData) throws Exception { - // 进行中得任务 + public void missionRefresh(User user, List flyList, List missionStateChangeInfos, CumulationData cumulationData){ Set doingMissionIds = getDoingMissionIds(); - Map flyMap = SArroGantFly.getTaskTypeMap().get(result.subType.getMissionTypeValue()); - if (flyMap == null || flyMap.isEmpty()){ - return; - } - for (SArroGantFly fly : flyMap.values()) { + for (SArroGantFly fly : flyList) { // 任务子id int id = fly.getId(); // 不在执行中 @@ -84,7 +78,23 @@ public class CowFlySkyMissionType extends AbstractMissionType { // 任务列表更新 doingMissionIds.remove(id); getFinishMissionIds().add(id); - } } + + @Override + public void calCumulationDataResult(User user, CumulationData.Result result, List missionStateChangeInfos, CumulationData cumulationData) throws Exception { + Map flyMap = SArroGantFly.getTaskTypeMap().get(result.subType.getMissionTypeValue()); + if (flyMap == null || flyMap.isEmpty()){ + return; + } + missionRefresh(user, new ArrayList<>(flyMap.values()), missionStateChangeInfos, cumulationData); + } + +// public void initRefreshCumulationData(User user, List missionStateChangeInfos, CumulationData cumulationData, int activityId){ +// Map flyMap = SArroGantFly.getActivityMap().get(activityId); +// if (flyMap == null || flyMap.isEmpty()){ +// return; +// } +// missionRefresh(user, new ArrayList<>(flyMap.values()), missionStateChangeInfos, cumulationData); +// } } From 9a617bccd63334ad8ef753d5154f0a11b33b6605 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 29 Jan 2024 17:38:40 +0800 Subject: [PATCH 28/32] =?UTF-8?q?=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8bug=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/mission/MissionLoigc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index c645dcb33..1e8c8b902 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -490,7 +490,7 @@ public class MissionLoigc { */ public static void getCowFlySkyMission(User user ,List missionList){ CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType(); - CumulationData cumulationData = user.getUserMissionManager().getCumulationData(); + CumulationData cumulationData = user.getUserMissionManager().getCowFlyCumulationData(); // 进行中 Set doingMissionIds = missionType.getDoingMissionIds(); // 可领取 From 7b061cf4426ea2accd30296dc603093e4d227314 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 12 Feb 2024 19:07:30 +0800 Subject: [PATCH 29/32] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=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 ed0aa7339..af142624e 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"16", - "tables":"GlobalActivity|TreasureTaskConfig|ItemConfig" + "version":"6", + "tables":"GlobalActivity" } \ No newline at end of file From 23ad55fdcf5386270ffc59965bb699bfcb96520e Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 12 Feb 2024 19:13:51 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/hotfix.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/hotfix.json b/conf/hotfix.json index 444a9c747..b8eeab13c 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,6 +1,4 @@ { - "version":"6", - "classes":[ - {"name":"GetWorldArenaRecordInfoRequestHandler.class","fullName":"com.ljsd.jieling.handler.gtw.GetWorldArenaRecordInfoRequestHandler"} - ] + "version":"5", + "classes":[] } \ No newline at end of file From 6a47c21db0b65753574b8ec1e94a3e4907ed6981 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 19 Feb 2024 14:10:53 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index af142624e..4499a95c8 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"6", + "version":"7", "tables":"GlobalActivity" } \ No newline at end of file From 66d8a771184c7cf06f04543153df2215a4042e47 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 26 Feb 2024 14:11:56 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 4499a95c8..7da862d29 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"7", + "version":"8", "tables":"GlobalActivity" } \ No newline at end of file