From 58e6af7f729491235b6fff33baa2e1f20a860871 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 4 Nov 2021 13:47:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?SGlobalSystemConfig=E4=B8=ADifopen=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/GlobalDataManaager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 62c8b2b8d..58ce2c6d9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -304,6 +304,7 @@ public class GlobalDataManaager implements IManager { public void getTimeOfControl(ISession session){ MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_FUNCTIONOFTIME_RESPONSE_VALUE,getFunctionOfTimeResponse,true); + } private void updateGetFunctionOfTimeResponse(){ @@ -321,6 +322,15 @@ public class GlobalDataManaager implements IManager { long timeOpenOfThis =seasonOpenLong; long timeCloseOfThis =seasonEndLong; if(seasonInterval == 0){ + int[]limitDay = sGlobalSystemConfig.getIfOpen(); + if(limitDay != null && limitDay.length>0){ + if( limitDay[0] == 2 ){ + long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1; + if(day < limitDay[1]){ + continue; + } + } + } timeOpenOfThis = systemOpenLong; timeCloseOfThis = systemEndLong; }else{ From 2ef8596a6f6957695bafbbbfda6c350f833f4029 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 4 Nov 2021 13:56:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/hero/HeroGodSoulBindRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroGodSoulBindRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroGodSoulBindRequestHandler.java index 3fe0ba560..a3d0317b6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroGodSoulBindRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/HeroGodSoulBindRequestHandler.java @@ -23,7 +23,7 @@ public class HeroGodSoulBindRequestHandler extends BaseHandler Date: Mon, 22 Nov 2021 00:01:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E5=8F=91=E9=82=AE?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activityLogic/WeekCardLogic.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java index 60ce53bd0..f4aeb6c0c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java @@ -79,17 +79,17 @@ public class WeekCardLogic { weekCardVal.setBugTime(0); isSave = true; } - if(isSave){ - user.getPlayerInfoManager().setWeekCard(weekCard); - } - if(dropMap.size()>0){ - int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new); - String title = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_title"); - String content = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_txt"); - // 排行奖励 - MailLogic.getInstance().sendMail(user.getId(), title, content, - StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); - } + } + if(isSave){ + user.getPlayerInfoManager().setWeekCard(weekCard); + } + if(dropMap.size()>0){ + int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new); + String title = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_txt"); + // 排行奖励 + MailLogic.getInstance().sendMail(user.getId(), title, content, + StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); } }