back_recharge
wangyuan 2019-06-14 20:45:51 +08:00
parent c503817091
commit b4fe2a3916
5 changed files with 45 additions and 5 deletions

View File

@ -55,6 +55,7 @@ public class HandlerLogicThread extends Thread{
whiteMsg.add(MessageTypeProto.MessageType.GET_FRIEND_INFO_REQUEST_VALUE);
whiteMsg.add(MessageTypeProto.MessageType.GET_STARE_INFOS_REQUEST_VALUE);
whiteMsg.add(MessageTypeProto.MessageType.ARENA_INFO_REQUEST_VALUE);
whiteMsg.add(MessageTypeProto.MessageType.GET_RINGFIRE_INFO_REQUEST_VALUE);
whiteMsg.add(MessageTypeProto.MessageType.BUY_STORE_ITEM_REQUEST_VALUE);
//日后删除

View File

@ -308,6 +308,7 @@ public class CombatLogic {
MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"item not");
return;
}
getAdventureReward(user, arenaId, true,1);
adventureStateInfo.setLevel(adventureStateInfo.getLevel()+1);
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,null,true);
}
@ -324,7 +325,7 @@ public class CombatLogic {
return;
}
}
adventureFastReward = getAdventureReward(user, position);
adventureFastReward = getAdventureReward(user, position,false,0);
}else{
String err = StoreLogic.checkBuyGoodsAndUpdate(user,7,10008,1);
@ -338,9 +339,12 @@ public class CombatLogic {
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_REWARD_RESPONSE_VALUE,build,true);
}
private Map<Integer,CommonProto.Drop> getAdventureReward(User user, int position) throws Exception {
public Map<Integer,CommonProto.Drop> getAdventureReward(User user, int position,boolean sendMail,int reason) throws Exception {
AdventureManager adventureManager = user.getAdventureManager();
Map<Integer, AdventureStateInfo> adventureStateInfoMap = adventureManager.getAdventureStateInfoMap();
if(adventureStateInfoMap.isEmpty()){
return null;
}
int now = (int)(System.currentTimeMillis()/1000);
SGameSetting gameSetting = SGameSetting.getGameSetting();
int adventureRefresh = gameSetting.getAdventureRefresh();
@ -376,6 +380,31 @@ public class CombatLogic {
ItemUtil.combineReward(randomRewardGroup[adventureStateInfoTmp.getLevel()-1], 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap);
}
}
if(sendMail){
adventureStateInfoTmp.setStartTime(now);
}
}
if(sendMail){
if(!baseItemMap.isEmpty()){
String title = "";
String content = "";
if(reason == 1){
title = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_uplevel_title");
content = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_uplevel_content");
}else if(reason == 2){
title = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_viplevel_title");
content = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_viplevel_content");
}else {
return null;
}
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);
}
return null;
}
ItemUtil.drop(user,baseBuilder,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,BIReason.ADVENTURE_BASE_REWARD);
ItemUtil.drop(user,randomBuilder,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,BIReason.ADVENTURE_RANDOM_REWARDD);

View File

@ -198,9 +198,17 @@ public class ItemLogic {
int[][] sumConsume = SHeroLevlConfig.getsHeroLevlConfigMap().get(hero.getLevel()).getSumConsume();
ItemUtil.combineReward(sumConsume,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
int breakId = hero.getBreakId();
if(breakId!=0){
int starBreakId = hero.getStarBreakId();
if(breakId!=0 || starBreakId!=0){
SCHeroRankUpConfig scHeroRankUpConfig = SCHeroRankUpConfig.scHeroRankUpConfigMap.get(breakId);
ItemUtil.combineReward(scHeroRankUpConfig.getSumConsume(),baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
if(scHeroRankUpConfig!=null){
ItemUtil.combineReward(scHeroRankUpConfig.getSumConsume(),baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
}
scHeroRankUpConfig = SCHeroRankUpConfig.scHeroRankUpConfigMap.get(starBreakId);
if(scHeroRankUpConfig!=null){
ItemUtil.combineReward(scHeroRankUpConfig.getSumConsume(),baseItemMap,baseCardMap,baseEquipMap,baseRandomMap);
}
continue;
}
SItem sItem = SItem.getsItemMap().get(hero.getTemplateId());

View File

@ -9,6 +9,7 @@ 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.root.User;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.mission.GameEvent;
@ -167,6 +168,7 @@ public class PlayerLogic {
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,"not finfish");
return;
}
CombatLogic.getInstance().getAdventureReward(user, -1, true,2);
int vipLevel = playerInfoManager.getVipLevel();
playerInfoManager.updateVipInfo(user,vipLevel+1);
CommonProto.VipMissionInfo vipMissionResponse = MissionLoigc.getVipMissionResponse(user);

View File

@ -176,7 +176,7 @@ public class ItemUtil {
addEquip(user, equipMap, dropBuilder,reason);
}
private static String getReward(Map<Integer, Integer> itemMap,Map<Integer, Integer> cardMap,Map<Integer, Integer> equipMap, Map<Integer,Integer> randomMap) {
public static String getReward(Map<Integer, Integer> itemMap,Map<Integer, Integer> cardMap,Map<Integer, Integer> equipMap, Map<Integer,Integer> randomMap) {
StringBuilder reward= new StringBuilder();
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()){
if (reward.length() == 0){