Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
a6ab8bcdc0
|
@ -357,6 +357,9 @@ public class MissionEventDistributor {
|
||||||
MissionState missionState = missionStateChangeInfo.getMissionState();
|
MissionState missionState = missionStateChangeInfo.getMissionState();
|
||||||
int state = missionState.getState();
|
int state = missionState.getState();
|
||||||
int progress = 0;
|
int progress = 0;
|
||||||
|
if(gameMisionType==GameMisionType.MISSINGROOMMISSION){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if(gameMisionType == GameMisionType.COPYMISSION || gameMisionType == GameMisionType.TREASUREMISSION || gameMisionType == GameMisionType.SEVENMISSION || gameMisionType == GameMisionType.BLOODYMISSION){
|
if(gameMisionType == GameMisionType.COPYMISSION || gameMisionType == GameMisionType.TREASUREMISSION || gameMisionType == GameMisionType.SEVENMISSION || gameMisionType == GameMisionType.BLOODYMISSION){
|
||||||
progress = missionStateChangeInfo.getProgress();
|
progress = missionStateChangeInfo.getProgress();
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,16 +63,20 @@ public class MissingRoomMissionType extends AbstractMissionType{
|
||||||
MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD, reward(missionId));
|
MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD, reward(missionId));
|
||||||
missionTypeEnumListMap.add(stateChangeInfo);
|
missionTypeEnumListMap.add(stateChangeInfo);
|
||||||
} else {
|
} else {
|
||||||
|
List<int[]> reward = new ArrayList<>();
|
||||||
for (Integer id : getFinishMissionIds()) {
|
for (Integer id : getFinishMissionIds()) {
|
||||||
if(missingTime.get(id)==-1){
|
if(missingTime.get(id)==-1){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (missingTime.get(id)==0||missingTime.get(id) <= TimeUtils.now() / 1000) {
|
if (missingTime.get(id)==0||missingTime.get(id) <= TimeUtils.now() / 1000) {
|
||||||
missingTime.put(id,-1);
|
missingTime.put(id,-1);
|
||||||
MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(id, MissionState.REWARD, reward(id));
|
for(int[] re: reward(id)){
|
||||||
missionTypeEnumListMap.add(stateChangeInfo);
|
reward.add(re);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD,reward.toArray(new int[reward.size()][]));
|
||||||
|
missionTypeEnumListMap.add(stateChangeInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -528,10 +528,10 @@ public class ItemUtil {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(sItem.getId()==Global.MISSING_ROOM_ITEM&&reason==BIReason.ADVENTURE_BASE_REWARD){
|
if(sItem.getId()==Global.MISSING_ROOM_ITEM&&reason==BIReason.ADVENTURE_BASE_REWARD){
|
||||||
itemNumlimit = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(user.getPlayerInfoManager().getLevel()).getMazeTreasureMax()[1];
|
itemNumlimit = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(user.getPlayerInfoManager().getLevel()).getMazeTreasureMax();
|
||||||
}
|
}
|
||||||
if (item.getItemNum() + entry.getValue() >= itemNumlimit){
|
if (item.getItemNum() + entry.getValue() >= itemNumlimit){
|
||||||
if(sItem.getId()!=Global.MISSING_ROOM_ITEM||reason!=BIReason.ADVENTURE_BASE_REWARD){
|
if(sItem.getId()!=Global.MISSING_ROOM_ITEM||reason!=BIReason.ADVENTURE_BASE_REWARD||item.getItemNum()<itemNumlimit){
|
||||||
itemNum = itemNumlimit -item.getItemNum();
|
itemNum = itemNumlimit -item.getItemNum();
|
||||||
item.setItemNum(itemNumlimit);
|
item.setItemNum(itemNumlimit);
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class SPlayerLevelConfig implements BaseConfig {
|
||||||
|
|
||||||
private int extraAdd;
|
private int extraAdd;
|
||||||
|
|
||||||
private int[] mazeTreasureMax;
|
private int mazeTreasureMax;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -48,7 +48,7 @@ public class SPlayerLevelConfig implements BaseConfig {
|
||||||
return extraAdd;
|
return extraAdd;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int[] getMazeTreasureMax() {
|
public int getMazeTreasureMax() {
|
||||||
return mazeTreasureMax;
|
return mazeTreasureMax;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue