From 3a2a281b8141afd0e80dc787171fff7f38a44846 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 11:17:03 +0800 Subject: [PATCH 1/8] progress --- .../main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 +++ 1 file changed, 3 insertions(+) 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 8267d9dc1..f076faa62 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 @@ -87,6 +87,9 @@ public class MissionLoigc { progrss=1; } } + if(progrss<0){ + progrss=1; + } if(state!=2 && sTreasureTaskConfig.getTaskType() == MissionType.SENVER_HAPPY.getMissionTypeValue()){ if(progrss>0 && System.currentTimeMillis()>user.getActivityManager().getSenvenTime()){ state=1; From 4fd9a928b855bb9df4d87559070f969fca367c39 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 11:23:27 +0800 Subject: [PATCH 2/8] reward --- .../src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index e4a8588e7..638dbd9cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.fight; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.VipPrivilegeType; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.BIReason; @@ -870,6 +871,7 @@ public class CombatLogic { } String content=SErrorCodeEerverConfig.getI18NMessage("adventure_boss_reward_txt",new Object[]{user.getPlayerInfoManager().getNickName(),rank}); MailLogic.getInstance().sendMail(user.getId(),title,content,rewardByRank,nowTime, Global.MAIL_EFFECTIVE_TIME); + MongoUtil.getInstence().lastUpdate(); } String key = RedisUtil.getInstence().getKey(RedisKey.ADVENTRUEN_BOSS_RANK, ""); RedisUtil.getInstence().del(key); From c0f7cefaaa47685785eefbf54e91418e59e58a75 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 11:33:20 +0800 Subject: [PATCH 3/8] store --- .../java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 6 +++--- .../main/java/com/ljsd/jieling/logic/store/StoreLogic.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f076faa62..caafbebec 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 @@ -77,10 +77,10 @@ public class MissionLoigc { int progrss = sTreasureTaskConfig.getTaskValue()[1][0]; if(doingMissionIds.contains(missionId)){ state = 0; - if(progrss<0){ - progrss=0; - } progrss = getDoingProgress(user,dailyCumulationData,sTreasureTaskConfig.getTaskType(),sTreasureTaskConfig.getTaskValue()[0]); + if(progrss<0){ + progrss=0; + } }else if(finishMissionIds.contains(missionId)){ state = 1; if(progrss<0){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index 0b1e6e05f..23828f5e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -282,7 +282,7 @@ public class StoreLogic { SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.sPlayerLevelConfigMap.get(user.getPlayerInfoManager().getLevel()); add += sPlayerLevelConfig.getExtraAdd(); }else if(type == 2){ - int addPrivageId = extra[0]; + int addPrivageId = extra[1]; add += user.getPlayerInfoManager().getVipPrivilageValue(addPrivageId); } } From efcb80483c47c39a709e72e2959ac00afca1598f Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 11:45:40 +0800 Subject: [PATCH 4/8] store --- .../com/ljsd/jieling/logic/store/StoreLogic.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index 23828f5e7..8a54ad5b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -1,9 +1,6 @@ package com.ljsd.jieling.logic.store; -import com.ljsd.jieling.config.SGameSetting; -import com.ljsd.jieling.config.SPlayerLevelConfig; -import com.ljsd.jieling.config.SStoreConfig; -import com.ljsd.jieling.config.SStoreTypeConfig; +import com.ljsd.jieling.config.*; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; @@ -283,7 +280,10 @@ public class StoreLogic { add += sPlayerLevelConfig.getExtraAdd(); }else if(type == 2){ int addPrivageId = extra[1]; - add += user.getPlayerInfoManager().getVipPrivilageValue(addPrivageId); + int vipLevel = user.getPlayerInfoManager().getVipLevel(); + SVipLevelConfig sVipLevelConfig = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel); + Map privilegeMap = sVipLevelConfig.getPrivilegeMap(); + add +=privilegeMap.get(addPrivageId); } } } @@ -291,7 +291,7 @@ public class StoreLogic { for(int i=0;i Date: Sat, 10 Aug 2019 11:57:18 +0800 Subject: [PATCH 5/8] log --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index ac0ca0063..43fb3ba2f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1114,7 +1114,7 @@ public class HeroLogic { float score = sPropertyConfig.getScore(); result += propertyValue*score; - LOGGER.info("the value is ={},propertyValue={},score={},result ={},the value={}",propertyValue*score,propertyValue,score,result,propertyValue*score); + LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={},result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score); } return (int)result; } From dd0cab498dc469f1875ede25a83acec015e1198f Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 12:08:03 +0800 Subject: [PATCH 6/8] log --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 43fb3ba2f..5cb190eaf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -911,6 +911,7 @@ public class HeroLogic { } public Map calHeroNotBufferAttribute(User user, Hero hero,boolean isForce){ + LOGGER.info("cal herotid = {}",hero.getTemplateId()); Map heroAllAttribute = calHeroAllAttribute(hero,isForce); heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE)); Collection values = hero.getEquipByPositionMap().values(); @@ -941,10 +942,12 @@ public class HeroLogic { Equip equip = equipManager.getEquipMap().get(equipId); Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); Map secondValueByIdMap = equip.getSecondValueByIdMap(); + LOGGER.info("cal equip = {}",equip.getEquipId()); combinedAttribute(propertyValueByIdMap,heroAllAttribute); combinedAttribute(secondValueByIdMap,heroAllAttribute); SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equip.getEquipId()); equipForce+=sEquipConfig.getScore(); + LOGGER.info("cal equip = {} end",equip.getEquipId()); } //天赋异妖加成 Map ringFireMap = pokemonManager.getRingFireMap(); @@ -1004,6 +1007,7 @@ public class HeroLogic { heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE)); //装备战力保存 heroAllAttribute.put(HeroAttributeEnum.EquipForce.getPropertyId(),equipForce); + LOGGER.info("cal herotid = {},end",hero.getTemplateId()); return heroAllAttribute; } @@ -1127,6 +1131,7 @@ public class HeroLogic { propertyValue += heroAttributeMap.get(propertyId); } heroAttributeMap.put(propertyId,propertyValue); + LOGGER.info("the propertyId={} the propertyValue is ={},",propertyId,propertyValue); } } public void combinedAttribute(int[][] otherAttriMap,Map heroAttributeMap){ From 56017c2dee0fd71176c98f7f97b702c3e9e82797 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 1 Oct 2019 05:01:31 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 2 +- .../java/com/ljsd/jieling/util/TimeUtils.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 1cb71f413..f64f87903 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -41,7 +41,7 @@ public class ActivityLogic { public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception { //跟新签到天数 - if (!TimeUtils.isSameMonthWithNow(user.getPlayerInfoManager().getOffLineTime())) { + if (!TimeUtils.isSameMonthFiveWithNow(user.getPlayerInfoManager().getOffLineTime())) { user.getPlayerInfoManager().setSign(0); user.getPlayerInfoManager().setSignTotay(0); } else if (user.getPlayerInfoManager().getSignTotay() == 1) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java index b707c6cd3..49a882ebd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java @@ -828,6 +828,23 @@ public class TimeUtils { return (y1 == y2) && (m1 == m2); } + // 是否5点月刷新 + public static boolean isSameMonthFiveWithNow(long r1) { + Calendar c1 = Calendar.getInstance(); + c1.setTimeInMillis(r1-5*60*60*1000); + int y1 = c1.get(Calendar.YEAR); + int m1 = c1.get(Calendar.MONTH) + 1; + + Calendar c2 = Calendar.getInstance(); + c2.setTimeInMillis(now()-5*60*60*1000); + int y2 = c2.get(Calendar.YEAR); + int m2 = c2.get(Calendar.MONTH) + 1; +// int d2 = c2.get(Calendar.DAY_OF_MONTH); + + return (y1 == y2) && (m1 == m2); + } + + /** * 获得当天指定时间 From 7a275f2ae02f328c6f9d9ebc60d46a7a5655d4bd Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 10 Aug 2019 14:34:18 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/TimeUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java index 49a882ebd..61d14700c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/TimeUtils.java @@ -831,12 +831,12 @@ public class TimeUtils { // 是否5点月刷新 public static boolean isSameMonthFiveWithNow(long r1) { Calendar c1 = Calendar.getInstance(); - c1.setTimeInMillis(r1-5*60*60*1000); + c1.setTimeInMillis(r1-5*ONE_HOUR); int y1 = c1.get(Calendar.YEAR); int m1 = c1.get(Calendar.MONTH) + 1; Calendar c2 = Calendar.getInstance(); - c2.setTimeInMillis(now()-5*60*60*1000); + c2.setTimeInMillis(now()-5*ONE_HOUR); int y2 = c2.get(Calendar.YEAR); int m2 = c2.get(Calendar.MONTH) + 1; // int d2 = c2.get(Calendar.DAY_OF_MONTH);