From 586c38221dcff7a0513be492a0e1f3a0368369c6 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 1 May 2020 16:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=9D=83=E6=97=B6=E9=97=B4=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8F=AF=E5=8F=A0=E5=8A=A0=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E7=AD=BE=E5=88=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/dao/PlayerManager.java | 17 ++++++++++------- .../main/java/config/SPrivilegeTypeConfig.java | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 3e10d85f1..fdb02bf0e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -340,19 +340,22 @@ public class PlayerManager extends MongoBase { return; } long maxTime; - if(config.getContinueTime()==0){ - maxTime = 0; - }else{ + VipInfo newVipInfo = new VipInfo(); + if(config.getContinueTime()!=null){ if(vipInfo.containsKey(privilageId)){ + if(config.getContinueTime()[1]==1&&TimeUtils.now()/1000vipInfo.get(privilageId).getEffectTime()?(TimeUtils.now()/1000):vipInfo.get(privilageId).getEffectTime(); - maxTime = maxTime+config.getContinueTime(); + maxTime = maxTime+config.getContinueTime()[0]; }else { - maxTime = TimeUtils.now()/1000+config.getContinueTime(); + maxTime = TimeUtils.now()/1000+config.getContinueTime()[0]; } maxTime = (int)(TimeUtils.getLastOrUnderHour(maxTime*1000,5,true)/1000); + newVipInfo.setEffectTime((int)maxTime); } - vipInfo.put(privilageId,new VipInfo(0,(int)maxTime)); - updateString("vipInfo", vipInfo); + this.vipInfo.put(privilageId,newVipInfo); + updateString("vipInfo", this.vipInfo); } public void removeVipPriviliageId(int privilageId){ diff --git a/tablemanager/src/main/java/config/SPrivilegeTypeConfig.java b/tablemanager/src/main/java/config/SPrivilegeTypeConfig.java index 5b71904a8..ecd1c9f52 100644 --- a/tablemanager/src/main/java/config/SPrivilegeTypeConfig.java +++ b/tablemanager/src/main/java/config/SPrivilegeTypeConfig.java @@ -24,7 +24,7 @@ public class SPrivilegeTypeConfig implements BaseConfig { private int[][] condition; - private int continueTime; + private int[] continueTime; private static Map sPrivilegeTypeConfigMap; @@ -84,7 +84,7 @@ public class SPrivilegeTypeConfig implements BaseConfig { return condition; } - public int getContinueTime() { + public int[] getContinueTime() { return continueTime; }