From 108c2d98ea697de36094362800e2ae5d1c248fb1 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 5 Nov 2021 16:16:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=8E=89=E8=99=9A=E4=BF=AE=E6=AD=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrossYuxulundaoChallengeHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 11342954d..fd6eb0335 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -166,6 +166,18 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandlersetting.getScoreRange()[1]){ //35 + winerGetScore = setting.getScoreRange()[1]; + }else if(winerGetScore-setting.getScoreRange()[0]){//-1 + loserGetScore = -setting.getScoreRange()[0]; + }else if(loserGetScore<-setting.getScoreRange()[1]){//-35 + loserGetScore = -setting.getScoreRange()[1]; + } + //+新增表格内修正分数 int ackRandId = SMServerRankConfig.getIdByScore(ackScores); if (SMServerRankConfig.serverRankConfig.containsKey(ackRandId)) { @@ -177,7 +189,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandlersetting.getScoreRange()[1]){ //35 winerGetScore = setting.getScoreRange()[1]; }else if(winerGetScore Date: Fri, 5 Nov 2021 16:18:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/GameApplication.java | 4 ++-- .../java/com/ljsd/jieling/logic/GlobalDataManaager.java | 5 +---- .../src/main/java/com/ljsd/jieling/logic/dao/Item.java | 7 +++---- .../main/java/com/ljsd/jieling/logic/dao/ItemManager.java | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index f39c3ae47..c207221f0 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -64,6 +64,8 @@ public class GameApplication { CrossServiceLogic.serverInit(); CrossRankManager.getInstance().guildCacheHandle(); HotfixUtil.getInstance(); + // 游戏支付端口 + RedisUtil.getInstence().set(RedisKey.GAME_PAY_URL + GameApplication.serverId, RPCServerTask.userCallBackUrl); // 开启定时任务 // TaskKit.reset(); //控制台gm @@ -115,8 +117,6 @@ public class GameApplication { serverConfigTmp.setRestartTime(TimeUtils.getTimeStamp2(TimeUtils.now())); MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(serverConfigTmp); serverConfig = serverConfigTmp; - // 游戏支付端口 - RedisUtil.getInstence().set(RedisKey.GAME_PAY_URL + GameApplication.serverId, RPCServerTask.userCallBackUrl); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 58ce2c6d9..9eab7f225 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -256,7 +256,7 @@ public class GlobalDataManaager implements IManager { } @Override - public void init() throws Exception { + public void init(){ try { GuildFightLogic.familyFightStatus(); ActivityLogic.getInstance().checkSecretBoxSeason(); @@ -269,7 +269,6 @@ public class GlobalDataManaager implements IManager { ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); } if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(FunctionIdEnum.Endless.getFunctionType())){ - ServerConfig serverConfigTmp = MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class); if(MapLogic.endlessMapId==0){ FunctionIdEnum.Endless.getManager().startAction(globalSystemControl.getTimeControllerOfFunctionMap().get(FunctionIdEnum.Endless.getFunctionType())); } @@ -277,8 +276,6 @@ public class GlobalDataManaager implements IManager { if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(FunctionIdEnum.GuildBossFight.getFunctionType())){ GuildFightLogic.updateGuildBossInfoByTimes(globalSystemControl.getTimeControllerOfFunctionMap().get(FunctionIdEnum.GuildBossFight.getFunctionType()).getTimes()); } - - } MissionEventDistributor.init(); DataManagerDistributor.init(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java index 08652267d..0ff4ea4a3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java @@ -18,7 +18,6 @@ public class Item extends MongoBase { } public Item(int itemId,long itemNum){ - // this.setRootCollection(User._COLLECTION_NAME); this.itemId = itemId; this.itemNum = itemNum; this.endingTime = (int)(System.currentTimeMillis()/1000); @@ -30,7 +29,7 @@ public class Item extends MongoBase { return itemId; } - public void setItemId(int itemId) throws Exception { + public void setItemId(int itemId){ updateString("itemId", itemId); this.itemId = itemId; } @@ -39,7 +38,7 @@ public class Item extends MongoBase { return itemNum; } - public void setItemNum(long itemNum) throws Exception { + public void setItemNum(long itemNum){ updateString("itemNum", itemNum); this.itemNum = itemNum; } @@ -48,7 +47,7 @@ public class Item extends MongoBase { return endingTime; } - public void setEndingTime(int endingTime) throws Exception { + public void setEndingTime(int endingTime){ updateString("endingTime", endingTime); this.endingTime = endingTime; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java index f96d79eae..5926454a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java @@ -62,7 +62,7 @@ public class ItemManager extends MongoBase { this.itemMap = itemMap; } - public void addItem(Item item) throws Exception { + public void addItem(Item item) { item.init(this.getRootId(), getMongoKey() + ".itemMap." + item.getItemId()); updateString("itemMap." + item.getItemId(), item); itemMap.put(item.getItemId(), item); From ad50ec11cbc267098d2bf408594d1acd6adcc28c Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 5 Nov 2021 16:39:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=8E=89=E8=99=9A=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossServer/CrossYuxulundaoChallengeHandler.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index fd6eb0335..cf2040d0b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -161,11 +161,6 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandlersetting.getScoreRange()[1]){ //35 winerGetScore = setting.getScoreRange()[1]; @@ -177,7 +172,10 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler