Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
790e37a7a0
|
@ -96,7 +96,7 @@ public class GlobalDataManaager {
|
|||
long seasonOpenLong = sGlobalSystemConfig.getSeasonOpenLong();
|
||||
long seasonEndLong = sGlobalSystemConfig.getSeasonEndLong();
|
||||
long diffTime = seasonEndLong - seasonOpenLong;
|
||||
int seasonInterval = sGlobalSystemConfig.getSeasonInterval() * 3600*1000;
|
||||
int seasonInterval = sGlobalSystemConfig.getSeasonInterval() * 60*1000;
|
||||
|
||||
long passTims = now - seasonOpenLong;
|
||||
if(passTims>0){
|
||||
|
@ -261,7 +261,7 @@ public class GlobalDataManaager {
|
|||
long systemEndLong = sGlobalSystemConfig.getSystemEndLong();
|
||||
long seasonOpenLong = sGlobalSystemConfig.getSeasonOpenLong();
|
||||
long seasonEndLong = sGlobalSystemConfig.getSeasonEndLong();
|
||||
int seasonInterval = sGlobalSystemConfig.getSeasonInterval() * 3600*1000;
|
||||
int seasonInterval = sGlobalSystemConfig.getSeasonInterval() * 60*1000;
|
||||
long timeOpenOfThis =seasonOpenLong;
|
||||
long timeCloseOfThis =seasonEndLong;
|
||||
if(seasonInterval == 0){
|
||||
|
|
|
@ -596,13 +596,13 @@ public class FriendLogic {
|
|||
}
|
||||
playerInfoManager.updateVipPrivilage(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(),1);
|
||||
friendManager.updateHaveRewardMap(friend,2);
|
||||
reward.append(SSpecialConfig.getStringValue(SSpecialConfig.Friend_Gift));
|
||||
reward.append(SSpecialConfig.getStringValue(SSpecialConfig.Friend_Gift)).append("|");
|
||||
receieveFriends.add(friend);
|
||||
takeTimes++;
|
||||
}
|
||||
}
|
||||
|
||||
String rewardStr = reward.toString();
|
||||
String rewardStr = reward.toString().substring(0,reward.toString().length()-1);
|
||||
if (StringUtil.isEmpty(rewardStr)){
|
||||
throw new ErrorCodeException(ErrorCode.FRIENDS_GET_YET);
|
||||
}
|
||||
|
|
|
@ -629,6 +629,9 @@ public class MissionLoigc {
|
|||
case ESPECIAL_EQUIP:
|
||||
count = cumulationData.especialEquipStar.get(missionSubType[0]);
|
||||
break;
|
||||
case FIND_STAR:
|
||||
count = cumulationData.findStar;
|
||||
break;
|
||||
case TAKE_FRIEND_GIFT:
|
||||
count = cumulationData.takeFriendGifts;
|
||||
break;
|
||||
|
|
|
@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.mission.MissionType;
|
|||
public class FindStarManager implements BaseDataManager{
|
||||
@Override
|
||||
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
||||
data.findStar=+(int)parm[0];
|
||||
data.findStar+=(int)parm[0];
|
||||
return new CumulationData.Result(missionType);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue