vip特权结算收益
parent
12b13fa6b0
commit
2900cade4c
|
|
@ -88,7 +88,6 @@ public interface BIReason {
|
||||||
|
|
||||||
int SYSTERM_OPEN_REWARD = 54; //系统开放奖励
|
int SYSTERM_OPEN_REWARD = 54; //系统开放奖励
|
||||||
|
|
||||||
|
|
||||||
//道具消耗原因 1000开头
|
//道具消耗原因 1000开头
|
||||||
int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级
|
int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级
|
||||||
int SECRETBOX_CONSUME = 1001; //秘盒抽卡
|
int SECRETBOX_CONSUME = 1001; //秘盒抽卡
|
||||||
|
|
|
||||||
|
|
@ -192,7 +192,7 @@ public class CombatLogic {
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
Map<Integer, CommonProto.Drop> adventureFastReward =null;
|
Map<Integer, CommonProto.Drop> adventureFastReward =null;
|
||||||
if(type == 2){
|
if(type == 2){
|
||||||
adventureFastReward = getNewAdventureReward(user);
|
adventureFastReward = getNewAdventureReward(user,false);
|
||||||
}else{
|
}else{
|
||||||
String err ="";
|
String err ="";
|
||||||
if(position == 0){
|
if(position == 0){
|
||||||
|
|
@ -213,7 +213,7 @@ public class CombatLogic {
|
||||||
KtEventUtils.onKtEvent(user,ParamEventBean.UserGameType,KTGameType.TAKE_SECURE_REWARD.getIndex(),type*10);
|
KtEventUtils.onKtEvent(user,ParamEventBean.UserGameType,KTGameType.TAKE_SECURE_REWARD.getIndex(),type*10);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<Integer,CommonProto.Drop> getNewAdventureReward(User user) throws Exception {
|
public Map<Integer,CommonProto.Drop> getNewAdventureReward(User user,boolean sendMail) throws Exception {
|
||||||
MainLevelManager mainLevelManager = user.getMainLevelManager();
|
MainLevelManager mainLevelManager = user.getMainLevelManager();
|
||||||
Map<Integer, Integer> fightStateInfo = user.getMainLevelManager().getFightStateInfo();
|
Map<Integer, Integer> fightStateInfo = user.getMainLevelManager().getFightStateInfo();
|
||||||
SGameSetting gameSetting = SGameSetting.getGameSetting();
|
SGameSetting gameSetting = SGameSetting.getGameSetting();
|
||||||
|
|
@ -254,7 +254,8 @@ public class CombatLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int lastTime = mainLevelManager.getLastTime();
|
int lastTime = mainLevelManager.getLastTime();
|
||||||
int times = ((int)(System.currentTimeMillis()/1000) - lastTime)/SGameSetting.getGameSetting().getAdventureRefresh();
|
int now = (int) (System.currentTimeMillis() / 1000);
|
||||||
|
int times = (now - lastTime)/SGameSetting.getGameSetting().getAdventureRefresh();
|
||||||
int maxTimes = adventureOffline - takeTimes;
|
int maxTimes = adventureOffline - takeTimes;
|
||||||
int lastTimeTakes=0;
|
int lastTimeTakes=0;
|
||||||
if(maxTimes>0){
|
if(maxTimes>0){
|
||||||
|
|
@ -268,6 +269,21 @@ public class CombatLogic {
|
||||||
}
|
}
|
||||||
lastTimeTakes=times;
|
lastTimeTakes=times;
|
||||||
}
|
}
|
||||||
|
if(sendMail){
|
||||||
|
if(!baseItemMap.isEmpty()){
|
||||||
|
int vipLevel = user.getPlayerInfoManager().getVipLevel();
|
||||||
|
String title = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_viplevel_title");
|
||||||
|
String content = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_viplevel_content",new Object[]{vipLevel});
|
||||||
|
String reward = ItemUtil.getReward(baseItemMap, baseCardMap, baseEquipMap, baseRandomMap);
|
||||||
|
String randomReward = ItemUtil.getReward(randomItemMap, randomCardMap, randomEquipMap, randomRandomMap);
|
||||||
|
if(randomReward.length()!=0){
|
||||||
|
reward = reward + "|" + randomReward;
|
||||||
|
}
|
||||||
|
MailLogic.getInstance().sendMail(user.getId(),title,content,reward,now,Global.MAIL_EFFECTIVE_TIME);
|
||||||
|
}
|
||||||
|
mainLevelManager.afterTakeStateReward(takeTimes,true,0);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
mainLevelManager.afterTakeStateReward(takeTimes,maxTimes<=0,lastTimeTakes);
|
mainLevelManager.afterTakeStateReward(takeTimes,maxTimes<=0,lastTimeTakes);
|
||||||
ItemUtil.drop(user,baseBuilder,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.ADVENTURE_BASE_REWARD);
|
ItemUtil.drop(user,baseBuilder,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.ADVENTURE_BASE_REWARD);
|
||||||
ItemUtil.drop(user,randomBuilder,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD);
|
ItemUtil.drop(user,randomBuilder,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD);
|
||||||
|
|
|
||||||
|
|
@ -225,7 +225,7 @@ public class PlayerLogic {
|
||||||
|
|
||||||
int vipLevel = playerInfoManager.getVipLevel();
|
int vipLevel = playerInfoManager.getVipLevel();
|
||||||
playerInfoManager.updateVipInfo(user,vipLevel+1);
|
playerInfoManager.updateVipInfo(user,vipLevel+1);
|
||||||
// CombatLogic.getInstance().getAdventureReward(user, -1, true,2);
|
CombatLogic.getInstance().getNewAdventureReward(user, true);
|
||||||
List<CommonProto.UserMissionInfo> missionList = new ArrayList<>();
|
List<CommonProto.UserMissionInfo> missionList = new ArrayList<>();
|
||||||
MissionLoigc.getVipMission(user,missionList);
|
MissionLoigc.getVipMission(user,missionList);
|
||||||
CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder()
|
CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue