Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

lvxinran 2021-06-08 06:26:43 +08:00
commit e78e0141a3
4 changed files with 14 additions and 30 deletions

View File

@ -149,9 +149,6 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
//up miss
int[][] reward = sActivityRewardConfig.getReward();
CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD);
if(drop.getHeroList().size() > 0){
fiveStarPushByActivity(user,drop.getHero(0).getHeroId(),1);
}
checkAndSetProgress(activityMission, activityProgressInfo, missionId);
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if (null != sGlobalActivity && ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(session.getUid(),id, activityMission) && sGlobalActivity.getResetGrade() == 1) {
@ -381,13 +378,4 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true);
}
/**
*
*/
public static void fiveStarPushByActivity(User user,int itemId,int num){
SCHero scHero = SCHero.getsCHero().get(itemId);
if(scHero != null && scHero.getStar()==5){
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num));
}
}
}

View File

@ -1583,9 +1583,6 @@ public class ActivityLogic implements IEventHandler{
// 特权消耗
PlayerLogic.getInstance().checkAndUpdate(user, setting.getMaxTimes(), num);
if(drop.getHeroList().size()>1){
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,drop.getHeroList().size()));
}
// 事件分发
Poster.getPoster().dispatchEvent(new ChoiceDrawCardEvent(user.getId(),activityId,num));
@ -1632,6 +1629,7 @@ public class ActivityLogic implements IEventHandler{
count++;
// 随机数
int randomInt = MathUtils.randomInt(totalWeight);
LOGGER.error("心愿抽奖,总权重:{},随机值:{},权重区间:{}-{},当前次数:{}",totalWeight,randomInt,totalWeight-incs[2],totalWeight,count);
// up奖励信息
int[] result = new int[]{incs[0],incs[1]};

View File

@ -1140,9 +1140,6 @@ public class HeroLogic{
rankUpHeroExecute(targetHero);
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getTemplateId(),targetHero.getStar()));
if (targetHero.getStar()==5){
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(), targetHero.getStar(),1));
}
targetHero.setStarBreakId(scHeroRankUpConfig.getId());
user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,2,targetHero.getTemplateId(),targetHero.getStar());
@ -2490,9 +2487,6 @@ public class HeroLogic{
Map<Integer,Integer> randomMap = new ConcurrentHashMap<>();
randomMap.put(itemId, composeNum);
CommonProto.Drop.Builder drop = ItemUtil.useRandomItem(user,randomMap, BIReason.COMPOS_HERO_REWARD);
if(drop.getHeroList().size()>0){
fiveStarPushByCombine(user,drop.getHero(0).getHeroId(), composeNum);
}
if(drop.getPokemonList().size()>0){
fiveStarPokemonPushByCombine(user,drop.getPokemonList().get(0).getTempId(),composeNum);
}
@ -4596,15 +4590,6 @@ public class HeroLogic{
}
}
/**
*
*/
public static void fiveStarPushByCombine(User user,int itemId,int num){
SCHero scHero = SCHero.getsCHero().get(itemId);
if(scHero != null && scHero.getStar()==5){
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num));
}
}
/**
*

View File

@ -1263,6 +1263,9 @@ public class ItemUtil {
SItem sItem = SItem.getsItemMap().get(entry.getKey());
extraDropAop(user,dropBuilder,sItem);
}
if(reason != BIReason.HERO_RANDOM){
fiveStarPushByCombine(user,entry.getKey(),count);
}
}
if (reward.length() > 0) {
int nowTime = (int) (TimeUtils.now() / 1000);
@ -1716,4 +1719,14 @@ public class ItemUtil {
return 0L;
}
/**
*
*/
public static void fiveStarPushByCombine(User user,int itemId,int num){
SCHero scHero = SCHero.getsCHero().get(itemId);
if(scHero != null && scHero.getStar()==5){
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num));
}
}
}