Merge branch 'master_prb_gn' into master_test_gn

back_recharge
jiahuiwen 2021-10-20 13:17:58 +08:00
commit d1841984b7
6 changed files with 63 additions and 42 deletions

View File

@ -13,46 +13,46 @@ public class Repot37EventUtil {
public static void onKtEvent(User user, Report37EventType eventType, Object... parm) { public static void onKtEvent(User user, Report37EventType eventType, Object... parm) {
switch (eventType) { // switch (eventType) {
case TASK_FINISH_EVEMT: // case TASK_FINISH_EVEMT:
Report37TaskBean report37TaskBean = new Report37TaskBean(); // Report37TaskBean report37TaskBean = new Report37TaskBean();
report37TaskBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); // report37TaskBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId()));
report37TaskBean.setRoleid(String.valueOf(user.getId())); // report37TaskBean.setRoleid(String.valueOf(user.getId()));
int taskId = (int) parm[0]; // int taskId = (int) parm[0];
String taskName = String.valueOf(parm[1]); // String taskName = String.valueOf(parm[1]);
report37TaskBean.setTask_id(String.valueOf(taskId));//todo // report37TaskBean.setTask_id(String.valueOf(taskId));//todo
report37TaskBean.setTask_name(taskName); // report37TaskBean.setTask_name(taskName);
report37TaskBean.setGid(user.getPlayerInfoManager().getGid()); // report37TaskBean.setGid(user.getPlayerInfoManager().getGid());
report37TaskBean.setPid(user.getPlayerInfoManager().getPid()); // report37TaskBean.setPid(user.getPlayerInfoManager().getPid());
String signStr = report37TaskBean.getEvent_time() + report37TaskBean.getUid() + report37TaskBean.getZone_id() + report37TaskBean.getRoleid() + report37TaskBean.getTask_id()+SDK37Constans.appkey; // String signStr = report37TaskBean.getEvent_time() + report37TaskBean.getUid() + report37TaskBean.getZone_id() + report37TaskBean.getRoleid() + report37TaskBean.getTask_id()+SDK37Constans.appkey;
report37TaskBean.setSign(MD5Util.encrypByMd5(signStr)); // report37TaskBean.setSign(MD5Util.encrypByMd5(signStr));
DataMessageUtils.addLogQueue(report37TaskBean); // DataMessageUtils.addLogQueue(report37TaskBean);
break; // break;
case ROLE_LEVEUP_EVENT: // case ROLE_LEVEUP_EVENT:
Report37RoleLeveBean report37RoleLeveBean = new Report37RoleLeveBean(); // Report37RoleLeveBean report37RoleLeveBean = new Report37RoleLeveBean();
report37RoleLeveBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId())); // report37RoleLeveBean.setUid(String.valueOf(user.getPlayerInfoManager().getOpenId()));
report37RoleLeveBean.setRoleid(String.valueOf(user.getId())); // report37RoleLeveBean.setRoleid(String.valueOf(user.getId()));
report37RoleLeveBean.setRole_type("1"); // report37RoleLeveBean.setRole_type("1");
report37RoleLeveBean.setRole_name(user.getPlayerInfoManager().getNickName()); // report37RoleLeveBean.setRole_name(user.getPlayerInfoManager().getNickName());
report37RoleLeveBean.setRole_c_time(TimeUtils.getTimeStamp(user.getPlayerInfoManager().getCreateTime())); // report37RoleLeveBean.setRole_c_time(TimeUtils.getTimeStamp(user.getPlayerInfoManager().getCreateTime()));
report37RoleLeveBean.setRole_grade(user.getPlayerInfoManager().getLevel()); // report37RoleLeveBean.setRole_grade(user.getPlayerInfoManager().getLevel());
report37RoleLeveBean.setRole_grade_u_time(TimeUtils.getTimeStamp(System.currentTimeMillis())); // report37RoleLeveBean.setRole_grade_u_time(TimeUtils.getTimeStamp(System.currentTimeMillis()));
report37RoleLeveBean.setRole_grade_desc("null"); // report37RoleLeveBean.setRole_grade_desc("null");
report37RoleLeveBean.setBalance("null");//todo // report37RoleLeveBean.setBalance("null");//todo
report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(BuyGoodsNewLogic.getAllAmount(user) *100)); // report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(BuyGoodsNewLogic.getAllAmount(user) *100));
report37RoleLeveBean.setTotal_online_time(user.getPlayerInfoManager().getOnlineTime()); // report37RoleLeveBean.setTotal_online_time(user.getPlayerInfoManager().getOnlineTime());
report37RoleLeveBean.setGuild_id("");//todo // report37RoleLeveBean.setGuild_id("");//todo
report37RoleLeveBean.setGuild_name("0");//todo // report37RoleLeveBean.setGuild_name("0");//todo
report37RoleLeveBean.setGid(user.getPlayerInfoManager().getGid()); // report37RoleLeveBean.setGid(user.getPlayerInfoManager().getGid());
report37RoleLeveBean.setPid(user.getPlayerInfoManager().getPid()); // report37RoleLeveBean.setPid(user.getPlayerInfoManager().getPid());
String signSt = report37RoleLeveBean.getEvent_time() + report37RoleLeveBean.getUid() + report37RoleLeveBean.getZone_id() + report37RoleLeveBean.getRoleid() + SDK37Constans.appkey; // String signSt = report37RoleLeveBean.getEvent_time() + report37RoleLeveBean.getUid() + report37RoleLeveBean.getZone_id() + report37RoleLeveBean.getRoleid() + SDK37Constans.appkey;
report37RoleLeveBean.setSign(MD5Util.encrypByMd5(signSt)); // report37RoleLeveBean.setSign(MD5Util.encrypByMd5(signSt));
DataMessageUtils.addLogQueue(report37RoleLeveBean); // DataMessageUtils.addLogQueue(report37RoleLeveBean);
break; // break;
default:{ // default:{
//
} // }
} // }
} }
// public static <T> T hadResReport(Class<T> clazz,User user, Report37EventType eventType, Object... parm){ // public static <T> T hadResReport(Class<T> clazz,User user, Report37EventType eventType, Object... parm){
// switch (eventType) { // switch (eventType) {

View File

@ -66,7 +66,7 @@ public enum ActivityTypeEnum {
DEMON_TREASURE(ActivityType.DEMON_TREASURE,LimitRandomSpecialMonsterActivity::new), DEMON_TREASURE(ActivityType.DEMON_TREASURE,LimitRandomSpecialMonsterActivity::new),
NEW_GENERAL_ATTACK(ActivityType.NEW_GENERAL_ATTACK,DefaultEmptyActivity::new), NEW_GENERAL_ATTACK(ActivityType.NEW_GENERAL_ATTACK,DefaultEmptyActivity::new),
GOOD_LUCK(ActivityType.GOOD_LUCK,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), FIFTEEN_LOGIN(ActivityType.FIFTEEN_LOGIN,FifteenActivity::new),
LUCKY_GET(ActivityType.LUCKY_GET,LuckyGetActivity::new), LUCKY_GET(ActivityType.LUCKY_GET,LuckyGetActivity::new),
EQUIP_UPLEVEL(ActivityType.EQUIP_UPLEVEL,EquipUpLevelActivity::new), EQUIP_UPLEVEL(ActivityType.EQUIP_UPLEVEL,EquipUpLevelActivity::new),

View File

@ -1,5 +1,6 @@
package com.ljsd.jieling.logic.activity; package com.ljsd.jieling.logic.activity;
import com.ljsd.GameApplication;
import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityMission;
import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.jbean.ActivityProgressInfo;
import com.ljsd.jieling.logic.OnlineUserManager; 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.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import config.SActivityRewardConfig; import config.SActivityRewardConfig;
import config.SGlobalActivity;
/** /**
* Created by zsx on 2019/8/5 19:20 * Created by zsx on 2019/8/5 19:20
@ -15,6 +17,10 @@ class RechargeSumActivity extends AbstractActivity {
@Override @Override
public void onResume(User user) throws Exception { 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()); ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
takeAllReward(sessionByUid); takeAllReward(sessionByUid);

View File

@ -78,6 +78,9 @@ public class FriendLogic {
List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>(); List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>();
for (Integer friendId :friends){ for (Integer friendId :friends){
CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager);
if (friend == null) {
continue;
}
friendList.add(friend); friendList.add(friend);
} }
PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse
@ -97,6 +100,9 @@ public class FriendLogic {
List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>(); List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>();
for (Integer friendId :blackFriends){ for (Integer friendId :blackFriends){
CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager);
if (friend == null) {
continue;
}
friendList.add(friend); friendList.add(friend);
} }
PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse
@ -172,6 +178,9 @@ public class FriendLogic {
for (Integer commondUid : recommandFriends){ for (Integer commondUid : recommandFriends){
CommonProto.Friend friend = CBean2Proto.getFriendInfo(commondUid,friendManager); CommonProto.Friend friend = CBean2Proto.getFriendInfo(commondUid,friendManager);
if (friend == null) {
continue;
}
friendList.add(friend); friendList.add(friend);
} }
PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse
@ -212,6 +221,9 @@ public class FriendLogic {
List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>(); List<CommonProto.Friend> friendList = new CopyOnWriteArrayList<>();
for (Integer applyFriendId :applyFriends){ for (Integer applyFriendId :applyFriends){
CommonProto.Friend friend = CBean2Proto.getFriendInfo(applyFriendId,friendManager); CommonProto.Friend friend = CBean2Proto.getFriendInfo(applyFriendId,friendManager);
if (friend == null) {
continue;
}
friendList.add(friend); friendList.add(friend);
} }
PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse

View File

@ -811,6 +811,9 @@ public class CBean2Proto {
public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception { public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception {
User user = UserManager.getUser(friendId); User user = UserManager.getUser(friendId);
if (user == null) {
return null;
}
PlayerManager playerInfoManager = user.getPlayerInfoManager(); PlayerManager playerInfoManager = user.getPlayerInfoManager();
int isGrive = 0; int isGrive = 0;
int haveReward = 0; int haveReward = 0;

View File

@ -132,7 +132,7 @@ public class SGlobalActivity implements BaseConfig {
case 4: case 4:
// 在某某时间之后开服不会出现 // 在某某时间之后开服不会出现
long timeOpen4 = TimeUtils.stringToTimeLong(String.valueOf(ifOpen[1]), TimeUtils.ymdFormat); 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; return false;
} }
break; break;