From 1c7dbd7b4d3a8f254625556cbf155a8afac79693 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 14:02:24 +0800 Subject: [PATCH 1/5] close activity --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 5 ++++- 1 file changed, 4 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 d48bf60a7..42be17850 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 @@ -198,8 +198,11 @@ public class ActivityLogic { if (null==abstractActivity) { continue; } - abstractActivity .onActivityEndSelfWithDealReward(user); + abstractActivity.onActivityEndSelfWithDealReward(user); activityManager.removeActivity(activityId); + if(sGlobalActivity.getShopId()!=0){ + user.getStoreManager().removeStoreInfo(sGlobalActivity.getShopId()); + } LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId); if (builder != null) { builder.addCloseActivityId(activityId); From c0aa602e21e8a513fea573884d26aa94380b5234 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 17:04:52 +0800 Subject: [PATCH 2/5] fix force --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index faf497314..3ae671239 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -271,7 +271,7 @@ public class PlayerLogic { int uid = iSession.getUid(); User user = UserManager.getUser(uid); if(user.getTeamPosManager().getTeamPosForHero().containsKey(teamId)){ - int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, true); + int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); if(user.getPlayerInfoManager().getMaxForce() < teamForce){ user.getPlayerInfoManager().setMaxForce(teamForce); String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false); From 6296f1e1eda7c8607618ea14d56659d9f58f4d2d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 17:11:44 +0800 Subject: [PATCH 3/5] fix herologic --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 a1c80166d..57751a267 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 @@ -1301,11 +1301,7 @@ public class HeroLogic { public int calHeoForce(User user, Hero hero,boolean isMyself){ Map heroAllAttribute; - if(!isMyself || user.getMapManager().getCurMapId() == 0){ - heroAllAttribute=calHeroNotBufferAttribute(user, hero,true,0); - }else{ - heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0); - } + heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0); //战力保存 int force = calForce(heroAllAttribute); return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId()); From 5d487705daa74d042d4f26fa4785b413ab33020b Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 20 Sep 2019 17:39:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=86=85=E5=AD=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/GmService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index c83b265fb..3bcb37b37 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -20,13 +20,11 @@ import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.thrift.idl.InvalidOperException; import com.ljsd.jieling.thrift.idl.RPCRequestGMIFace; import com.ljsd.jieling.thrift.idl.Result; -import com.ljsd.jieling.util.AyyncWorker; -import com.ljsd.jieling.util.InnerMessageUtil; -import com.ljsd.jieling.util.MathUtils; -import com.ljsd.jieling.util.MessageUtil; +import com.ljsd.jieling.util.*; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.redis.core.ZSetOperations; import java.io.BufferedReader; import java.io.File; @@ -98,7 +96,6 @@ public class GmService implements RPCRequestGMIFace.Iface { } - List sendIds = new LinkedList<>(); if (obj instanceof GmGlobleAbstract) { for (ISession session : OnlineUserManager.sessionMap.values()) { @@ -116,12 +113,22 @@ public class GmService implements RPCRequestGMIFace.Iface { } }else if(cmd.contains("recharge")){ sendIds.addAll(rechargeInfoMap.keySet()); + }else if(cmd.contains("force")){ + + Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.FORCE_RANK, "", 0, 60); + for (ZSetOperations.TypedTuple item : rankInfo) { + String value = item.getValue(); + int uid = Integer.parseInt(value); + sendIds.add(uid); + } + } else{ String[] ids = parameters[0].split("#"); for (String id : ids) { sendIds.add(Integer.valueOf(id)); } } + } int randomTime = sendIds.size() * 1; //两分钟内发完所有协议 From c399c67a2a494e32b1bd173e2cef91ff282589a9 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 18:24:34 +0800 Subject: [PATCH 5/5] fix force --- serverlogic/src/main/java/com/ljsd/GmService.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index 3bcb37b37..4ec658ba5 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -115,7 +115,7 @@ public class GmService implements RPCRequestGMIFace.Iface { sendIds.addAll(rechargeInfoMap.keySet()); }else if(cmd.contains("force")){ - Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.FORCE_RANK, "", 0, 60); + Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.FORCE_RANK, "", 0, -1); for (ZSetOperations.TypedTuple item : rankInfo) { String value = item.getValue(); int uid = Integer.parseInt(value); 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 57751a267..bf74b8084 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 @@ -1301,7 +1301,7 @@ public class HeroLogic { public int calHeoForce(User user, Hero hero,boolean isMyself){ Map heroAllAttribute; - heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0); + heroAllAttribute = calHeroNotBufferAttribute(user, hero,true,0); //战力保存 int force = calForce(heroAllAttribute); return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId());