逻辑优化
parent
f88b520d0f
commit
68726ee38d
|
@ -18,7 +18,6 @@ class BuyGoldActivity extends AbstractActivity {
|
|||
|
||||
public BuyGoldActivity(int id) {
|
||||
super(id);
|
||||
// Poster.getPoster().listenEvent(this, UserOnlineEvent.class);
|
||||
Poster.getPoster().listenEvent(this, GoldRefreshEvent.class);
|
||||
}
|
||||
|
||||
|
@ -34,8 +33,6 @@ class BuyGoldActivity extends AbstractActivity {
|
|||
listValue.add(151);
|
||||
listValue.add(152);
|
||||
listValue.forEach(type -> {
|
||||
// SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> {
|
||||
// int innerId = sPrivilegeTypeConfig.getId();
|
||||
ids.add(type);
|
||||
if (!user.getPlayerInfoManager().containPrivilageId(type))
|
||||
user.getPlayerInfoManager().addVipByTime(type, time);
|
||||
|
|
|
@ -38,7 +38,7 @@ import java.util.*;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Description: 远征 猎妖之路
|
||||
* Description: 大闹天宫
|
||||
* Author: zsx
|
||||
* CreateDate: 2020/1/7 11:46
|
||||
*
|
||||
|
@ -471,13 +471,12 @@ public class ExpeditionLogic {
|
|||
integers.add(sortId+1);
|
||||
return integers;
|
||||
}
|
||||
|
||||
if(sortId==0){
|
||||
integers.add(1);
|
||||
integers.add(2);
|
||||
return integers;
|
||||
}
|
||||
int mod = sortId%5;
|
||||
int mod = sortId % 5;
|
||||
if(mod==0){
|
||||
integers.add(sortId+2);
|
||||
return integers;
|
||||
|
@ -528,14 +527,14 @@ public class ExpeditionLogic {
|
|||
}
|
||||
|
||||
private static void checkAndResetTreasure(User user) throws Exception {
|
||||
// SExpeditionSetting sExpeditionSetting = STableManager.getConfig(SExpeditionSetting.class).get(1);
|
||||
WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward();
|
||||
if(worldTreasureReward.getFirstStartTime()>TimeUtils.nowInt()){
|
||||
int nowInt = TimeUtils.nowInt();
|
||||
if(worldTreasureReward.getFirstStartTime()> nowInt){
|
||||
return;
|
||||
}
|
||||
int createTime =worldTreasureReward.getCreateTime();
|
||||
//重置
|
||||
if(TimeUtils.nowInt()>=createTime){
|
||||
if(nowInt >=createTime){
|
||||
user.getExpeditionManager().resetTreasureReward();
|
||||
// 天宫秘宝礼包刷新
|
||||
ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(106);
|
||||
|
|
|
@ -406,13 +406,16 @@ public class PlayerLogic {
|
|||
|
||||
public Set<CommonProto.Privilege> getPrivilege(User user, Collection<Integer> collection) {
|
||||
Map<Integer, VipInfo> vipInfo = user.getPlayerInfoManager().getVipInfo();
|
||||
return vipInfo.entrySet().stream()
|
||||
.filter(integerVipInfoEntry -> collection.contains(integerVipInfoEntry.getKey()))
|
||||
.map(integerVipInfoEntry -> CommonProto.Privilege.newBuilder()
|
||||
.setId(integerVipInfoEntry.getKey())
|
||||
.setUsedTimes(integerVipInfoEntry.getValue().getCount())
|
||||
.setEffectTime(integerVipInfoEntry.getValue().getEffectTime())
|
||||
.build()).collect(Collectors.toSet());
|
||||
HashSet<CommonProto.Privilege> set = new HashSet<>();
|
||||
for (Map.Entry<Integer, VipInfo> entry : vipInfo.entrySet()) {
|
||||
Integer key = entry.getKey();
|
||||
VipInfo value = entry.getValue();
|
||||
if (collection.contains(key)){
|
||||
CommonProto.Privilege build = CommonProto.Privilege.newBuilder().setId(key).setUsedTimes(value.getCount()).setEffectTime(value.getEffectTime()).build();
|
||||
set.add(build);
|
||||
}
|
||||
}
|
||||
return set;
|
||||
}
|
||||
|
||||
public void sendVipDailyOrLevelUpReward(User user, int reson) throws Exception {
|
||||
|
|
Loading…
Reference in New Issue