Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2021-12-13 16:07:02 +08:00
commit 9d232a7783
3 changed files with 29 additions and 3 deletions

View File

@ -147,6 +147,7 @@ public class JourneyMap {
.setFirst(v.isFirstPass()?1:0)
.build();
response.addInfos(info);
response.setFinishNum(user.getMapManager().getJourneyFinishNum());
});
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
}
@ -468,6 +469,8 @@ public class JourneyMap {
// 逍遥游最终奖励埋点
if (pathType == 7){
ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_TRAVEL.getType(), pathType, mapId);
int finishNum=user.getMapManager().getJourneyFinishNum()+1;
user.getMapManager().setJourneyFinishNum(finishNum);
}
}

View File

@ -2170,9 +2170,18 @@ public class MapLogic {
case 4: {
int num = 0;
Map<Integer, SEquipConfig> equipConfig = STableManager.getConfig(SEquipConfig.class);
for (Map.Entry<Integer, Long> entry : user.getItemManager().getEquipBookMap().entrySet()) {
if (equipConfig.get(entry.getKey()).getStar() >= ints[1]) {
num++;
for (Map.Entry<Integer, Item> equipEntry : user.getItemManager().getItemMap().entrySet()) {
if (SItem.getsItemMap().get(equipEntry.getKey()).getItemType() == 3) {
if (equipConfig.get(equipEntry.getKey()).getStar() >= ints[1]) {
num+=equipEntry.getValue().getItemNum();
}
}
}
for (Map.Entry<String, Hero> stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) {
for (Map.Entry<Integer, Integer> entry : stringHeroEntry.getValue().getEquipByPositionMap().entrySet()) {
if (equipConfig.get(entry.getValue()).getStar() >= ints[1]) {
num++;
}
}
}
if (num < ints[2]) {
@ -2191,6 +2200,9 @@ public class MapLogic {
for (Map.Entry<String, Hero> stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) {
if (stringHeroEntry.getValue().getOriginalLevel()>= ints[1]) {
num++;
if (num >= ints[2]) {
break;
}
}
}
if (num < ints[2]) {

View File

@ -122,6 +122,8 @@ public class MapManager extends MongoBase {
private Map<Integer,PathInfo> journeyInfo = new HashMap<>();
private int journeyFinishNum;//逍遥游通关次数
private int currentJourneyId;
private EndlessTreasureReward endlessTreasureReward = new EndlessTreasureReward();
@ -878,6 +880,15 @@ public class MapManager extends MongoBase {
updateString("journeyInfo",journeyInfo);
}
public int getJourneyFinishNum() {
return journeyFinishNum;
}
public void setJourneyFinishNum(int journeyFinishNum) {
this.journeyFinishNum = journeyFinishNum;
updateString("journeyFinishNum",journeyFinishNum);
}
public int getCurrentJourneyId() {
return currentJourneyId;
}