# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
back_recharge
lvxinran 2019-08-21 14:03:49 +08:00
commit 3ba8de06f2
6 changed files with 17 additions and 8 deletions

View File

@ -9,6 +9,8 @@ import com.ljsd.jieling.globals.GlobalGm;
import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.globals.GlobalItemType;
import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.map.MapLogic;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.fight.CombatLogic;
@ -200,6 +202,9 @@ public class GMRequestHandler extends BaseHandler{
vipMissionIdsType.getFinishMissionIds().addAll(vipMissionIdsType.getDoingMissionIds()); vipMissionIdsType.getFinishMissionIds().addAll(vipMissionIdsType.getDoingMissionIds());
vipMissionIdsType.getDoingMissionIds().clear(); vipMissionIdsType.getDoingMissionIds().clear();
cUser.getUserMissionManager().setVipMissionIdsType(vipMissionIdsType); cUser.getUserMissionManager().setVipMissionIdsType(vipMissionIdsType);
//TODO 22测试后回退
ActivityLogic.getInstance().updateActivityMissionProgress(cUser, ActivityType.LUCKYCAT,prarm1);
break; break;
case GlobalGm.RESET_USER_NAME: case GlobalGm.RESET_USER_NAME:
PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0); PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0);

View File

@ -249,7 +249,6 @@ public class GlobalDataManaager {
public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception { public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
// 需要隔天刷新的字段统一在这里处理 // 需要隔天刷新的字段统一在这里处理
if (TimeUtils.isOverTime(5,user.getPlayerInfoManager().getLoginTime())) { if (TimeUtils.isOverTime(5,user.getPlayerInfoManager().getLoginTime())) {
user.getPlayerInfoManager().setIsdayFirst(0);
//活动刷新 //活动刷新
ActivityLogic.getInstance().flushEveryDay(user,fBuilder); ActivityLogic.getInstance().flushEveryDay(user,fBuilder);
PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder); PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder);
@ -276,6 +275,8 @@ public class GlobalDataManaager {
byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE, fBuilder.build()); byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE, fBuilder.build());
session.setFiveByteBuf(byteBuf); session.setFiveByteBuf(byteBuf);
} }
}else {
user.getPlayerInfoManager().setIsdayFirst(0);
} }
} }
} }

View File

@ -79,11 +79,10 @@ public class LuckyCatActivity extends AbstractActivity {
return; return;
} }
if (activityMission.getValue() < sLuckyRewardConfig.getRmbValue()) { // if (activityMission.getValue() < sLuckyRewardConfig.getRmbValue()) {
MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "value illegality"); // MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "value illegality");
return; // return;
} // }
if (activityProgressInfo.getProgrss() >= SLuckyCatConfig.getMiss2time(missionId)) { if (activityProgressInfo.getProgrss() >= SLuckyCatConfig.getMiss2time(missionId)) {
MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "had taked"); MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "had taked");

View File

@ -215,6 +215,9 @@ public class PlayerLogic {
.setVipLevel(playerInfoManager.getVipLevel()).build(); .setVipLevel(playerInfoManager.getVipLevel()).build();
PlayerInfoProto.VipLevelUpResponse.Builder builder = PlayerInfoProto.VipLevelUpResponse.newBuilder().addAllUserMissionInfo(missionList); PlayerInfoProto.VipLevelUpResponse.Builder builder = PlayerInfoProto.VipLevelUpResponse.newBuilder().addAllUserMissionInfo(missionList);
builder.setVipBaseInfo(vipInfoProto); builder.setVipBaseInfo(vipInfoProto);
//TODO 22测试后回退
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,vipLevel+1);
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,builder.build(),true); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,builder.build(),true);
} }

View File

@ -175,7 +175,7 @@ public class BuyGoodsLogic {
user.getPlayerInfoManager().addRechargedaily(price); user.getPlayerInfoManager().addRechargedaily(price);
//TODO 用事件分发 //TODO 用事件分发
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt()); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt());
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); //ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price);
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price);
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,rechargeInfo.getSaveAmt()); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,rechargeInfo.getSaveAmt());
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, user.getPlayerInfoManager().getRechargedaily()); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, user.getPlayerInfoManager().getRechargedaily());

View File

@ -224,7 +224,8 @@ public class CBean2Proto {
.setLevel(playerInfoManager.getLevel()) .setLevel(playerInfoManager.getLevel())
.setName(playerInfoManager.getNickName()) .setName(playerInfoManager.getNickName())
.setHurt(hurtNum) .setHurt(hurtNum)
.setHead(String.valueOf(0)) .setHead(playerInfoManager.getHead())
.setHeadFrame(playerInfoManager.getHeadFrame())
.setRank(rank) .setRank(rank)
.build(); .build();
} }