Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
93239139c1
|
@ -135,11 +135,14 @@ public class ArenaLogic {
|
||||||
}
|
}
|
||||||
int uid = session.getUid();
|
int uid = session.getUid();
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.UNLOCK_SKIP_FIGHT);
|
if(skipFight == 0){
|
||||||
if(!allowed){
|
boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.UNLOCK_SKIP_FIGHT);
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,"not allowed");
|
if(!allowed){
|
||||||
return;
|
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,"not allowed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String err = checkChallenge(user);
|
String err = checkChallenge(user);
|
||||||
if(!"".equals(err)){
|
if(!"".equals(err)){
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,err);
|
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,err);
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class PlayerManager extends MongoBase {
|
||||||
|
|
||||||
private int hadTakeLevelBoxVip; //领取vip等级礼包
|
private int hadTakeLevelBoxVip; //领取vip等级礼包
|
||||||
|
|
||||||
private int hadTakeDailyBoxVip; //领取vip每日礼包
|
private int hadTakeDailyBoxVip=-1; //领取vip每日礼包
|
||||||
|
|
||||||
private int maxForce; //玩家历史最高战力
|
private int maxForce; //玩家历史最高战力
|
||||||
|
|
||||||
|
@ -302,6 +302,6 @@ public class PlayerManager extends MongoBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateString("vipInfo", vipInfo);
|
updateString("vipInfo", vipInfo);
|
||||||
setHadTakeDailyBoxVip(0);
|
setHadTakeDailyBoxVip(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,11 +183,11 @@ public class PlayerLogic {
|
||||||
rewards = sVipLevelConfig.getVipBoxReward();
|
rewards = sVipLevelConfig.getVipBoxReward();
|
||||||
reson = BIReason.TAKE_VIP_LEVEL_REWARD;
|
reson = BIReason.TAKE_VIP_LEVEL_REWARD;
|
||||||
}else if(type == 2){
|
}else if(type == 2){
|
||||||
if(playerInfoManager.getHadTakeDailyBoxVip() == 1 || playerInfoManager.getHadTakeLevelBoxVip() == 0 ){
|
if(playerInfoManager.getHadTakeDailyBoxVip() == 1 || playerInfoManager.getHadTakeLevelBoxVip() == -1 ){
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.VIP_TAKE_REWARD_RESPONSE_VALUE,"had taked the vip daily reward");
|
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.VIP_TAKE_REWARD_RESPONSE_VALUE,"had taked the vip daily reward");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
playerInfoManager.setHadTakeDailyBoxVip(1);
|
playerInfoManager.setHadTakeDailyBoxVip(playerInfoManager.getVipLevel());
|
||||||
rewards = sVipLevelConfig.getVipBoxDailyReward();
|
rewards = sVipLevelConfig.getVipBoxDailyReward();
|
||||||
reson = BIReason.TAKE_VIP_DAILY_REWARD;
|
reson = BIReason.TAKE_VIP_DAILY_REWARD;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue