back_recharge
wangyuan 2019-07-24 14:24:07 +08:00
parent eca6706f75
commit 9943d08dba
2 changed files with 6 additions and 8 deletions

View File

@ -146,6 +146,7 @@ public class ActivityLogic {
if(hadBuyTreasure == 1){
changeState =ActivityType.FINISH_TAKED;
}
int treasureScore =playerInfoManager.getTreasureScore();
CommonProto.Drop.Builder drop = null;
if(missionId == -1){
List<int[][]> dropList = new ArrayList<>(10);
@ -161,7 +162,7 @@ public class ActivityLogic {
}
ActivityProgressInfo value = activityProgressInfoItem.getValue();
int stateTmp = value.getState();
if(changeState!=stateTmp){
if(changeState!=stateTmp && treasureScore>=sTreasureConfig.getPoints()){
STreasureConfig sTreasureConfigTmp = STreasureConfig.configMap.get(mineMision);
if(stateTmp == ActivityType.WILL_TAKE){
dropList.add(sTreasureConfigTmp.getReward());
@ -211,7 +212,6 @@ public class ActivityLogic {
}
if(type == 1){
List<int[][]> dropList = new ArrayList<>(2);
int treasureScore =playerInfoManager.getTreasureScore();
if(treasureScore<sTreasureConfig.getPoints()){
MessageUtil.sendErrorResponse(session,0,rewardResponseValue,"not finish");
return;

View File

@ -293,9 +293,9 @@ public class HeroLogic {
int orderBoxContinue = sLotterySetting.getOrderBoxContinue();
long now = System.currentTimeMillis();
ServerConfig serverConfig = GameApplication.serverConfig;
int diffHours = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60%( (orderBoxContinue + orderBoxContinue)));
int diffSeaseon = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60/( (orderBoxContinue + orderBoxContinue)));
if(diffHours<=orderBoxOpenTime){
int diffHours = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60%( (orderBoxOpenTime + orderBoxContinue)));
int diffSeaseon = (int)((now - serverConfig.getCacheOpenTime())/1000/60/60/( (orderBoxOpenTime + orderBoxContinue97)));
if(diffHours>=orderBoxOpenTime){
return orderBoxPool[diffSeaseon%orderBoxPool.length];
}
return 0;
@ -338,7 +338,7 @@ public class HeroLogic {
}
return null;
}
public void getAllTeamPosInfo(ISession session) throws Exception {
User user = UserManager.getUser(session.getUid());
List<CommonProto.TeamPosInfo> teamPosInfoList = new ArrayList<>();
@ -972,8 +972,6 @@ public class HeroLogic {
int[][] effect = (int[][])it.next();
combinedAttribute(effect,heroAllAttribute);
}
calInteractAdd(heroAllAttribute);
heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE));
//装备战力保存