Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
a1250a948b
|
@ -10,6 +10,9 @@ import com.ljsd.jieling.logic.dao.root.User;
|
||||||
public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
||||||
@Override
|
@Override
|
||||||
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
||||||
|
if(missionValue==-1){
|
||||||
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
|
}
|
||||||
int[][] configValues = sAccomplishmentConfig.getValues();
|
int[][] configValues = sAccomplishmentConfig.getValues();
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||||
|
@ -19,18 +22,17 @@ public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
||||||
if(configValues[0].length<2){
|
if(configValues[0].length<2){
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
if(missionValue==configValues[1][0]){
|
|
||||||
missionValue = -1;
|
|
||||||
}
|
|
||||||
if(missionValue==-1){
|
|
||||||
return missionValue;
|
|
||||||
}
|
|
||||||
for(int i = 1 ; i <configValues[0].length;i++){
|
for(int i = 1 ; i <configValues[0].length;i++){
|
||||||
if(eventId!=configValues[0][i]){
|
if(eventId!=configValues[0][i]){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
missionValue++;
|
missionValue++;
|
||||||
}
|
}
|
||||||
|
if(missionValue==configValues[1][0]){
|
||||||
|
missionValue = -1;
|
||||||
|
}
|
||||||
return missionValue;
|
return missionValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,12 @@ public class ActivityLogic {
|
||||||
|
|
||||||
//跟新签到天数
|
//跟新签到天数
|
||||||
if (user.getPlayerInfoManager().getSignTotay() == 1) {
|
if (user.getPlayerInfoManager().getSignTotay() == 1) {
|
||||||
user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1);
|
Calendar cale = Calendar.getInstance();
|
||||||
|
int first = cale.getActualMinimum(Calendar.DAY_OF_MONTH);
|
||||||
|
if (first == 1)
|
||||||
|
user.getPlayerInfoManager().setSign(1);
|
||||||
|
else
|
||||||
|
user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1);
|
||||||
user.getPlayerInfoManager().setSignTotay(0);
|
user.getPlayerInfoManager().setSignTotay(0);
|
||||||
}
|
}
|
||||||
//更新每日充值
|
//更新每日充值
|
||||||
|
|
Loading…
Reference in New Issue