From 50093c8c58cad5caa26139c01f1534051ffc6f30 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 9 Jan 2020 17:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=9D=83=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=82=B9=E8=B5=9E=E7=89=A9=E5=93=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/globals/BIReason.java | 4 +++- .../com/ljsd/jieling/logic/dao/PlayerManager.java | 8 ++++---- .../com/ljsd/jieling/logic/family/GuildLogic.java | 1 + tablemanager/src/main/java/config/SGuildSetting.java | 12 +++++++++--- 4 files changed, 17 insertions(+), 8 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 3b99501c0..4ff12a7e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -103,7 +103,9 @@ public interface BIReason { int GUILD_BOSS_FIGHT_REWARD = 61;//工会boss奖励 - int CHAMPIONM_EXCHANGE_REWARD = 1050;//巅峰赛兑换奖励 + int CHAMPIONM_EXCHANGE_REWARD = 62;//巅峰赛兑换奖励 + + int SEND_LIKE_REWARD = 63;//红包榜点赞奖励 int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级 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 c637ea926..f2ab4f5ed 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 @@ -339,19 +339,19 @@ public class PlayerManager extends MongoBase { if (config==null){ return; } - int maxTime; + long maxTime; if(config.getContinueTime()==0){ maxTime = 0; }else{ if(vipInfo.containsKey(privilageId)){ - maxTime = (int)(TimeUtils.now()/1000>vipInfo.get(privilageId).getEffectTime()?(TimeUtils.now()/1000):vipInfo.get(privilageId).getEffectTime()); + maxTime = TimeUtils.now()/1000>vipInfo.get(privilageId).getEffectTime()?(TimeUtils.now()/1000):vipInfo.get(privilageId).getEffectTime(); maxTime = maxTime+config.getContinueTime(); }else { - maxTime = (int)(TimeUtils.now()/1000+config.getContinueTime()); + maxTime = TimeUtils.now()/1000+config.getContinueTime(); } } maxTime = (int)(TimeUtils.getLastHour(maxTime*1000,5)/1000); - vipInfo.put(privilageId,new VipInfo(0,maxTime)); + vipInfo.put(privilageId,new VipInfo(0,(int)maxTime)); updateString("vipInfo", vipInfo); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 6cd2603a0..0909d9263 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1113,6 +1113,7 @@ public class GuildLogic { if(user.getFriendManager().getTodayLike().contains(targetUid)){ throw new ErrorCodeException(ErrorCode.ALREADY_LIKE); } + ItemUtil.drop(user,new int[][]{SGuildSetting.sGuildSetting.getGiveLikeReward()},BIReason.SEND_LIKE_REWARD); User targetUser = UserManager.getUser(targetUid); AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, n->targetUser.getFriendManager().addBeLikedCount(1)); user.getFriendManager().addTodayLike(targetUid); diff --git a/tablemanager/src/main/java/config/SGuildSetting.java b/tablemanager/src/main/java/config/SGuildSetting.java index 9fc36fc63..fe7b1452b 100644 --- a/tablemanager/src/main/java/config/SGuildSetting.java +++ b/tablemanager/src/main/java/config/SGuildSetting.java @@ -68,13 +68,15 @@ public class SGuildSetting implements BaseConfig { private int[][] renameCost; - public static SGuildSetting sGuildSetting; - private int bossTime; private float[][] bossReward; - + private int[] giveLikeReward; + + public static SGuildSetting sGuildSetting; + + @Override public void init() throws Exception { sGuildSetting = STableManager.getConfig(SGuildSetting.class).get(1); @@ -213,4 +215,8 @@ public class SGuildSetting implements BaseConfig { public float[][] getBossReward() { return bossReward; } + + public int[] getGiveLikeReward() { + return giveLikeReward; + } } \ No newline at end of file