Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
7670285223
|
@ -1117,7 +1117,7 @@ public class ActivityLogic {
|
|||
if(activities.isEmpty()){
|
||||
return false;
|
||||
}else{
|
||||
Object[] objects = activities.stream().filter(n -> getActivityOpenState(user, n.getId()) != ActivityType.OPEN_STATE).toArray();
|
||||
Object[] objects = activities.stream().filter(n -> getActivityOpenState(user, n.getId()) == ActivityType.OPEN_STATE).toArray();
|
||||
return objects.length>0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
package com.ljsd.jieling.logic.activity;
|
||||
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
import com.ljsd.jieling.logic.activity.event.RandomCardEvent;
|
||||
import com.ljsd.jieling.logic.rank.RankContext;
|
||||
import com.ljsd.jieling.logic.rank.RankEnum;
|
||||
import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
|
||||
/**
|
||||
* @author lvxinran
|
||||
|
@ -13,6 +18,7 @@ import com.ljsd.jieling.logic.rank.RankEnum;
|
|||
public class LimitRandomCardActivity extends AbstractActivity {
|
||||
public LimitRandomCardActivity(int id) {
|
||||
super(id);
|
||||
Poster.getPoster().listenEvent(this,RandomCardEvent.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -24,7 +30,22 @@ public class LimitRandomCardActivity extends AbstractActivity {
|
|||
if(cardEvent.getType()!=3){
|
||||
return;
|
||||
}
|
||||
RankContext.getRankEnum(RankEnum.RANDOM_CARD_RANK.getType()).addRank(cardEvent.getUid(),cardEvent.getScore());
|
||||
AbstractRank randomRank= RankContext.getRankEnum(RankEnum.RANDOM_CARD_RANK.getType());
|
||||
int scoreById = Double.valueOf(randomRank.getScoreById(((RandomCardEvent) event).getUid())).intValue();
|
||||
if(scoreById==-1){
|
||||
scoreById=0;
|
||||
}
|
||||
randomRank.addRank(cardEvent.getUid(),scoreById+cardEvent.getScore());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean takeReward(ISession session, int missionId) throws Exception {
|
||||
return super.takeReward(session, missionId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityEnd() throws Exception {
|
||||
RedisUtil.getInstence().del(RedisKey.RANDOM_CARD_RANK);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ import com.ljsd.jieling.logic.activity.ActivityLogic;
|
|||
import com.ljsd.jieling.logic.activity.event.HeroFiveStarGetEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
import com.ljsd.jieling.logic.activity.event.RandomCardEvent;
|
||||
import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
@ -292,7 +293,7 @@ public class HeroLogic{
|
|||
dropHeroAndItem[j++] = tenTimesMustGetItem[i];
|
||||
}
|
||||
}
|
||||
// Poster.getPoster().dispatchEvent();
|
||||
Poster.getPoster().dispatchEvent(new RandomCardEvent(uid,sLotterySetting.getLotteryType(),10*sLotterySetting.getPerCount()));
|
||||
CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, dropHeroAndItem,BIReason.HERO_RANDOM);
|
||||
builder.setDrop(drop);
|
||||
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE, builder.build(), true);
|
||||
|
|
Loading…
Reference in New Issue