Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
ea69d5b7e9
|
@ -87,7 +87,7 @@ public class NewGeneralAttackHandler extends BaseHandler<ActivityProto.NewGenera
|
||||||
}
|
}
|
||||||
|
|
||||||
// 战斗逻辑
|
// 战斗逻辑
|
||||||
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.FORMATION_NORMAL, 1000, "", GameFightType.NewGeneral, monsterGroupId, 3);
|
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.FORMATION_NORMAL, 20, "", GameFightType.NewGeneral, monsterGroupId, 3);
|
||||||
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
|
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
|
||||||
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
||||||
.setFightMaxTime(20)
|
.setFightMaxTime(20)
|
||||||
|
|
|
@ -493,6 +493,21 @@ public class ActivityLogic implements IEventHandler{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 连续签到任务,处理
|
||||||
|
if(activityId == ActivityType.SIGN_BOX){
|
||||||
|
// 之前签到时间,如果时间为0,不做处理
|
||||||
|
long o1 = activityMission.getCreatTime();
|
||||||
|
if (o1 != 0){
|
||||||
|
// 获取当天零点时间戳
|
||||||
|
long o2 = TimeUtils.getAppointTime(0);
|
||||||
|
// 后面比前面多几天
|
||||||
|
int day = TimeUtils.differentDays(o1, o2);
|
||||||
|
if (day > 1){
|
||||||
|
activityMission.setV(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (sGlobalActivity.getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
|
if (sGlobalActivity.getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue