back_recharge
zhangshanxue 2020-05-27 19:25:07 +08:00
commit 67930da50f
5 changed files with 54 additions and 34 deletions

View File

@ -23,7 +23,7 @@ public class WorldBossTreasureStaticConfig extends AbstractClassStaticConfig {
Map<Integer,Set<SWorldBossTreasureConfig>> idsByPeriodsTmp = new HashMap<>();
config.forEach((id,item)->{
int[] activityIds = item.getActivityId();
idsByPeriodsTmp.putIfAbsent(activityIds[0], new HashSet<>());
idsByPeriodsTmp.putIfAbsent(activityIds[0], new LinkedHashSet<>());
Set<SWorldBossTreasureConfig> ids = idsByPeriodsTmp.get(activityIds[0]);
for(int i=1;i<activityIds.length;i++){
idsByPeriodsTmp.putIfAbsent(activityIds[i],ids);

View File

@ -10,7 +10,7 @@ import java.util.Map;
public class WorldTreasureReward extends MongoBase {
private int createTime; //取当天零点 根据其可以推算出期数。
private int round;
private int round=1;
private int score;
private Map<Integer,Integer> rewardStatusMap = new HashMap<>(); //领取状态 1表示领取基础奖励 2表示领取额外奖励。
@ -24,7 +24,7 @@ public class WorldTreasureReward extends MongoBase {
}
score = 0;
rewardStatusMap = new HashMap<>();
this.round = round;
}
@Override
@ -37,6 +37,10 @@ public class WorldTreasureReward extends MongoBase {
}
public int getRound() {
if(round == 0){
this.round = 1;
updateString("round", round);
}
return round;
}

View File

@ -82,7 +82,8 @@ public class ExpeditionLogic {
ExpeditionManager manager = user.getExpeditionManager();
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Expedition);
if(manager.getCurrentTime()==openTimeOfFuntionCacheByType.getTimes()){
if(openTimeOfFuntionCacheByType==null||manager.getCurrentTime()==openTimeOfFuntionCacheByType.getTimes()){
return;
}
takeAllReward(user);

View File

@ -1603,9 +1603,9 @@ public class HeroLogic{
float score = sPropertyConfig.getScore();
result += propertyValue*score;
LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={}result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score);
// LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={}result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score);
}
System.out.println(result);
// System.out.println(result);
return (int)result;
}

View File

@ -130,26 +130,37 @@ public class StoreLogic implements IEventHandler {
}
}
if(sStoreTypeConfig.getRefreshType()[0]==2&& calendar.get(Calendar.MINUTE) ==0 && sStoreTypeConfig.getRefreshType()[1]==calendar.get(Calendar.HOUR_OF_DAY)){
for(ISession session : OnlineUserManager.sessionMap.values()){
if(session.getFiveReady() == 1){
User user = UserManager.getUser(session.getUid());
if(user.getStoreManager().getStoreInfoMap().containsKey(sStoreTypeConfig.getId())){
updateUsersStoreAyync(UserManager.getUser(session.getUid()),user1 -> {
StoreInfo storeInfo = user.getStoreManager().getStoreInfoMap().get(sStoreTypeConfig.getId());
if(sStoreTypeConfig.getRefreshType()[0]==2&& calendar.get(Calendar.MINUTE) ==0){
Map<Integer, Integer> storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user);
if(storeItem == null){
LOGGER.error("the uid={},the storeID={} is null",user.getId(),sStoreTypeConfig.getId());
return;
}
storeInfo.setItemNumMap(storeItem);
storeInfo.setLastRefreshTime(now);
MongoUtil.getInstence().lastUpdate();
sendStoreUpdateIndication(user.getId(),storeInfo);
});
}
for(int i = 1;i<sStoreTypeConfig.getRefreshType().length;i++){
if(sStoreTypeConfig.getRefreshType()[i]!=calendar.get(Calendar.HOUR_OF_DAY)){
continue;
}
sendRefreshIndication(sStoreTypeConfig,now);
break ;
}
}
}
}
private static void sendRefreshIndication(SStoreTypeConfig sStoreTypeConfig,long lastRefreshTime) throws Exception {
for(ISession session : OnlineUserManager.sessionMap.values()){
if(session.getFiveReady() == 1){
User user = UserManager.getUser(session.getUid());
if(user.getStoreManager().getStoreInfoMap().containsKey(sStoreTypeConfig.getId())){
updateUsersStoreAyync(UserManager.getUser(session.getUid()),user1 -> {
StoreInfo storeInfo = user.getStoreManager().getStoreInfoMap().get(sStoreTypeConfig.getId());
Map<Integer, Integer> storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user);
if(storeItem == null){
LOGGER.error("the uid={},the storeID={} is null",user.getId(),sStoreTypeConfig.getId());
return;
}
storeInfo.setItemNumMap(storeItem);
storeInfo.setLastRefreshTime(lastRefreshTime);
MongoUtil.getInstence().lastUpdate();
sendStoreUpdateIndication(user.getId(),storeInfo);
});
}
}
}
@ -219,11 +230,13 @@ public class StoreLogic implements IEventHandler {
}
}
if(sStoreTypeConfig.getRefreshType()[0] == 2){
if (TimeUtils.isOverAppointRefreshTime(nowTime,storeInfo.getLastRefreshTime(),sStoreTypeConfig.getRefreshType()[1])){
Map<Integer, Integer> storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user);
storeInfo.setLastRefreshTime(nowTime);
storeInfo.setItemNumMap(storeItem);
sendStoreUpdateIndication(user.getId(),storeInfo);
for(int i = 0 ; i<sStoreTypeConfig.getRefreshType().length;i++){
if (TimeUtils.isOverAppointRefreshTime(nowTime,storeInfo.getLastRefreshTime(),sStoreTypeConfig.getRefreshType()[i])){
Map<Integer, Integer> storeItem = getStoreItem(sStoreTypeConfig.getId(), sStoreTypeConfig, user);
storeInfo.setLastRefreshTime(nowTime);
storeInfo.setItemNumMap(storeItem);
sendStoreUpdateIndication(user.getId(),storeInfo);
}
}
}
@ -626,12 +639,14 @@ public class StoreLogic implements IEventHandler {
long nowTime = System.currentTimeMillis();
switch (type){
case 2:
boolean overTime = TimeUtils.isOverTime(time, storeInfo.getLastRefreshTime());
if (overTime){
itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
storeInfo.setLastRefreshTime(nowTime);
for(int i=1;i<sStoreTypeConfig.getRefreshType().length;i++){
boolean overTime = TimeUtils.isOverTime(i, storeInfo.getLastRefreshTime());
if (overTime){
itemNumMap = getStoreItem(sStoreTypeConfig.getId(),sStoreTypeConfig,user);
storeInfo.setLastRefreshTime(nowTime);
}
break;
}
break;
case 3:
long lastRefreshTime = storeInfo.getLastRefreshTime();
int intervalTime = time*1000*60*60;