Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
f3c36df669
|
@ -358,8 +358,10 @@ public class GlobalDataManaager implements IManager {
|
||||||
}
|
}
|
||||||
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
||||||
flushGoodsTimes(user);
|
flushGoodsTimes(user);
|
||||||
|
BuyGoodsLogic.flushEveryDay(user);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
user.getUserMissionManager().onGameEvent(user, GameEvent.LOGIN_GAME,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -560,6 +560,7 @@ public class BuyGoodsLogic {
|
||||||
while (endTime<now){
|
while (endTime<now){
|
||||||
endTime += SRechargeCommodityConfig.rechargeCommodityConfigMap.get(sRechargeCommodityConfig.getId()).getDailyUpdate() * TimeUtils.ONE_DAY ;
|
endTime += SRechargeCommodityConfig.rechargeCommodityConfigMap.get(sRechargeCommodityConfig.getId()).getDailyUpdate() * TimeUtils.ONE_DAY ;
|
||||||
}
|
}
|
||||||
|
//tofix 不知道源作者想处理什么
|
||||||
if(!refreshBagMap.containsKey(sRechargeCommodityConfig.getId()) || refreshBagMap.get(sRechargeCommodityConfig.getId())!=endTime){
|
if(!refreshBagMap.containsKey(sRechargeCommodityConfig.getId()) || refreshBagMap.get(sRechargeCommodityConfig.getId())!=endTime){
|
||||||
refreshBagMap.put(sRechargeCommodityConfig.getId(),endTime);
|
refreshBagMap.put(sRechargeCommodityConfig.getId(),endTime);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue