From 942338df7d908d990e3af3fbcfbee0e6efe3d2a8 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 19 Oct 2021 18:25:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityTypeEnum.java | 2 +- .../ljsd/jieling/logic/activity/RechargeSumActivity.java | 6 ++++++ tablemanager/src/main/java/config/SGlobalActivity.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 4dfc20183..a96ea6d69 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -66,7 +66,7 @@ public enum ActivityTypeEnum { DEMON_TREASURE(ActivityType.DEMON_TREASURE,LimitRandomSpecialMonsterActivity::new), NEW_GENERAL_ATTACK(ActivityType.NEW_GENERAL_ATTACK,DefaultEmptyActivity::new), GOOD_LUCK(ActivityType.GOOD_LUCK,DefaultEmptyActivity::new), - COW_FLY_SKY(ActivityType.COW_FLY_SKY,CowFlySkyActivity::new), + COW_FLY_SKY(ActivityType.COW_FLY_SKY,CowFlySkyActivity::new),//牛气冲天 FIFTEEN_LOGIN(ActivityType.FIFTEEN_LOGIN,FifteenActivity::new), LUCKY_GET(ActivityType.LUCKY_GET,LuckyGetActivity::new), EQUIP_UPLEVEL(ActivityType.EQUIP_UPLEVEL,EquipUpLevelActivity::new), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java index 1c79097eb..e200c4997 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumActivity.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.GameApplication; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.OnlineUserManager; @@ -7,6 +8,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import config.SActivityRewardConfig; +import config.SGlobalActivity; /** * Created by zsx on 2019/8/5 19:20 @@ -15,6 +17,10 @@ class RechargeSumActivity extends AbstractActivity { @Override public void onResume(User user) throws Exception { + boolean open = SGlobalActivity.checkActivityIfOpen(id, user.getPlayerInfoManager().getCreateTime(), GameApplication.serverConfig.getCacheOpenTime()); + if (!open){ + return; + } //补发前日未领取的奖 ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); takeAllReward(sessionByUid); diff --git a/tablemanager/src/main/java/config/SGlobalActivity.java b/tablemanager/src/main/java/config/SGlobalActivity.java index f18a16c31..49be08452 100644 --- a/tablemanager/src/main/java/config/SGlobalActivity.java +++ b/tablemanager/src/main/java/config/SGlobalActivity.java @@ -132,7 +132,7 @@ public class SGlobalActivity implements BaseConfig { case 4: // 在某某时间之后开服不会出现 long timeOpen4 = TimeUtils.stringToTimeLong(String.valueOf(ifOpen[1]), TimeUtils.ymdFormat); - if (value[1] != 0 && value[1] > timeOpen4){ + if (value[1] != 0 && value[1] >= timeOpen4){ return false; } break; From ca7c565f2f10fc89f3edb70dd1cee59fb10152e8 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 20 Oct 2021 11:07:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=20null=20=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/friend/FriendLogic.java | 12 ++++++++++++ .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 3 +++ 2 files changed, 15 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index d69634b7f..9dcd0d624 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -78,6 +78,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :friends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -97,6 +100,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :blackFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -172,6 +178,9 @@ public class FriendLogic { for (Integer commondUid : recommandFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(commondUid,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -212,6 +221,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer applyFriendId :applyFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(applyFriendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b1c29280e..226d9e09a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -811,6 +811,9 @@ public class CBean2Proto { public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception { User user = UserManager.getUser(friendId); + if (user == null) { + return null; + } PlayerManager playerInfoManager = user.getPlayerInfoManager(); int isGrive = 0; int haveReward = 0; From c88779326277f3ee401707ad4a7c28609d436781 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 20 Oct 2021 13:14:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A37=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportBeans_37/Repot37EventUtil.java | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java index 147b820a6..982b3f4ea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java @@ -13,46 +13,46 @@ public class Repot37EventUtil { public static void onKtEvent(User user, Report37EventType eventType, Object... parm) { - switch (eventType) { - case TASK_FINISH_EVEMT: - Report37TaskBean report37TaskBean = new Report37TaskBean(); - report37TaskBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); - report37TaskBean.setRoleid(String.valueOf(user.getId())); - int taskId = (int) parm[0]; - String taskName = String.valueOf(parm[1]); - report37TaskBean.setTask_id(String.valueOf(taskId));//todo - report37TaskBean.setTask_name(taskName); - report37TaskBean.setGid(user.getPlayerInfoManager().getGid()); - report37TaskBean.setPid(user.getPlayerInfoManager().getPid()); - String signStr = report37TaskBean.getEvent_time() + report37TaskBean.getUid() + report37TaskBean.getZone_id() + report37TaskBean.getRoleid() + report37TaskBean.getTask_id()+SDK37Constans.appkey; - report37TaskBean.setSign(MD5Util.encrypByMd5(signStr)); - DataMessageUtils.addLogQueue(report37TaskBean); - break; - case ROLE_LEVEUP_EVENT: - Report37RoleLeveBean report37RoleLeveBean = new Report37RoleLeveBean(); - report37RoleLeveBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); - report37RoleLeveBean.setRoleid(String.valueOf(user.getId())); - report37RoleLeveBean.setRole_type("1"); - report37RoleLeveBean.setRole_name(user.getPlayerInfoManager().getNickName()); - report37RoleLeveBean.setRole_c_time(TimeUtils.getTimeStamp(user.getPlayerInfoManager().getCreateTime())); - report37RoleLeveBean.setRole_grade(user.getPlayerInfoManager().getLevel()); - report37RoleLeveBean.setRole_grade_u_time(TimeUtils.getTimeStamp(System.currentTimeMillis())); - report37RoleLeveBean.setRole_grade_desc("null"); - report37RoleLeveBean.setBalance("null");//todo - report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(BuyGoodsNewLogic.getAllAmount(user) *100)); - report37RoleLeveBean.setTotal_online_time(user.getPlayerInfoManager().getOnlineTime()); - report37RoleLeveBean.setGuild_id("");//todo - report37RoleLeveBean.setGuild_name("0");//todo - report37RoleLeveBean.setGid(user.getPlayerInfoManager().getGid()); - report37RoleLeveBean.setPid(user.getPlayerInfoManager().getPid()); - String signSt = report37RoleLeveBean.getEvent_time() + report37RoleLeveBean.getUid() + report37RoleLeveBean.getZone_id() + report37RoleLeveBean.getRoleid() + SDK37Constans.appkey; - report37RoleLeveBean.setSign(MD5Util.encrypByMd5(signSt)); - DataMessageUtils.addLogQueue(report37RoleLeveBean); - break; - default:{ - - } - } +// switch (eventType) { +// case TASK_FINISH_EVEMT: +// Report37TaskBean report37TaskBean = new Report37TaskBean(); +// report37TaskBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); +// report37TaskBean.setRoleid(String.valueOf(user.getId())); +// int taskId = (int) parm[0]; +// String taskName = String.valueOf(parm[1]); +// report37TaskBean.setTask_id(String.valueOf(taskId));//todo +// report37TaskBean.setTask_name(taskName); +// report37TaskBean.setGid(user.getPlayerInfoManager().getGid()); +// report37TaskBean.setPid(user.getPlayerInfoManager().getPid()); +// String signStr = report37TaskBean.getEvent_time() + report37TaskBean.getUid() + report37TaskBean.getZone_id() + report37TaskBean.getRoleid() + report37TaskBean.getTask_id()+SDK37Constans.appkey; +// report37TaskBean.setSign(MD5Util.encrypByMd5(signStr)); +// DataMessageUtils.addLogQueue(report37TaskBean); +// break; +// case ROLE_LEVEUP_EVENT: +// Report37RoleLeveBean report37RoleLeveBean = new Report37RoleLeveBean(); +// report37RoleLeveBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); +// report37RoleLeveBean.setRoleid(String.valueOf(user.getId())); +// report37RoleLeveBean.setRole_type("1"); +// report37RoleLeveBean.setRole_name(user.getPlayerInfoManager().getNickName()); +// report37RoleLeveBean.setRole_c_time(TimeUtils.getTimeStamp(user.getPlayerInfoManager().getCreateTime())); +// report37RoleLeveBean.setRole_grade(user.getPlayerInfoManager().getLevel()); +// report37RoleLeveBean.setRole_grade_u_time(TimeUtils.getTimeStamp(System.currentTimeMillis())); +// report37RoleLeveBean.setRole_grade_desc("null"); +// report37RoleLeveBean.setBalance("null");//todo +// report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(BuyGoodsNewLogic.getAllAmount(user) *100)); +// report37RoleLeveBean.setTotal_online_time(user.getPlayerInfoManager().getOnlineTime()); +// report37RoleLeveBean.setGuild_id("");//todo +// report37RoleLeveBean.setGuild_name("0");//todo +// report37RoleLeveBean.setGid(user.getPlayerInfoManager().getGid()); +// report37RoleLeveBean.setPid(user.getPlayerInfoManager().getPid()); +// String signSt = report37RoleLeveBean.getEvent_time() + report37RoleLeveBean.getUid() + report37RoleLeveBean.getZone_id() + report37RoleLeveBean.getRoleid() + SDK37Constans.appkey; +// report37RoleLeveBean.setSign(MD5Util.encrypByMd5(signSt)); +// DataMessageUtils.addLogQueue(report37RoleLeveBean); +// break; +// default:{ +// +// } +// } } // public static T hadResReport(Class clazz,User user, Report37EventType eventType, Object... parm){ // switch (eventType) {