Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
30de1e8ff5
|
@ -51,13 +51,14 @@ public class DataManagerDistributor {
|
|||
|
||||
judges.put(MissionType.WORKSHOP_CREATE_EQUIP_NUMS,new WorkShopCreateEquipTimesManager());
|
||||
|
||||
judges.put(MissionType.GENERAL_STORY_TIMES,new FightDataManager());
|
||||
judges.put(MissionType.HERO_STORY_TIMES,new FightDataManager());
|
||||
|
||||
judges.put(MissionType.HERO_STORY_TIMES,new FightPlayDataManager());
|
||||
judges.put(MissionType.LEVEL_STORY_TIMES,new FightDataManager());
|
||||
|
||||
judges.put(MissionType.HERO_STORY_PLAY_TIMES,new FightPlayDataManager());
|
||||
judges.put(MissionType.INVASIONBOSS_PLAY_TIMES,new FightPlayDataManager());
|
||||
judges.put(MissionType.FAST_ADVENTUREREWARD_TIMES,new FightPlayDataManager());
|
||||
judges.put(MissionType.GENERAL_STORY_TIMES,new FightPlayDataManager());
|
||||
|
||||
judges.put(MissionType.HERO_LEVLE_TIMES,new HeroLevelUpManager());
|
||||
judges.put(MissionType.ARENA_FIGHTSUCCES_TIMES,new ArenaChallengeManager());
|
||||
|
|
|
@ -34,10 +34,7 @@ public class FightDataManager implements BaseDataManager{
|
|||
}
|
||||
|
||||
if(fightType == 1){
|
||||
if(missionType == MissionType.GENERAL_STORY_TIMES){
|
||||
data.generalStoryTimes+=fightTimes;
|
||||
result = new CumulationData.Result(missionType);
|
||||
}else if(missionType == MissionType.HERO_LEVLE_TIMES){
|
||||
if(missionType == MissionType.HERO_LEVLE_TIMES){
|
||||
data.heroStoryTimes+=fightTimes;
|
||||
result = new CumulationData.Result(missionType);
|
||||
}else if(missionType == MissionType.GENERAL_STORY_PASS){
|
||||
|
|
|
@ -7,12 +7,16 @@ public class FightPlayDataManager implements BaseDataManager{
|
|||
@Override
|
||||
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
||||
int type = (int)parm[0];
|
||||
if(type == 3 && missionType == MissionType.HERO_STORY_PLAY_TIMES){
|
||||
if(type == 3 && (missionType == MissionType.HERO_STORY_PLAY_TIMES || missionType == MissionType.HERO_STORY_TIMES)){
|
||||
data.heroStoryPlayTimes+=(int)parm[1];
|
||||
}else if(type == 999 && missionType == MissionType.INVASIONBOSS_PLAY_TIMES){
|
||||
data.invasionbossPlayTimes+=(int)parm[1];
|
||||
}else if(type == 9999 && missionType == MissionType.FAST_ADVENTUREREWARD_TIMES){
|
||||
data.fastAdventurerewardTimes+=(int)parm[1];
|
||||
}else if(type==1 && missionType == MissionType.GENERAL_STORY_TIMES){
|
||||
data.generalStoryTimes+=(int)parm[1];
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
return new CumulationData.Result(missionType);
|
||||
}
|
||||
|
|
|
@ -123,9 +123,9 @@ public class MissionEventDistributor {
|
|||
typeList.add(MissionType.GENERAL_STORY_PASS);
|
||||
typeList.add(MissionType.HERO_STORY_PASS);
|
||||
|
||||
typeList.add(MissionType.HERO_STORY_TIMES);
|
||||
|
||||
typeList.add(MissionType.LEVEL_STORY_TIMES);
|
||||
typeList.add(MissionType.GENERAL_STORY_TIMES);
|
||||
|
||||
|
||||
eventEnumListMap.put(GameEvent.STORY_FIGHT,typeList);
|
||||
eventProcessor.put(GameEvent.STORY_FIGHT,new CumulationDataEventProcessor());
|
||||
|
@ -134,6 +134,8 @@ public class MissionEventDistributor {
|
|||
typeList.add(MissionType.HERO_STORY_PLAY_TIMES);
|
||||
typeList.add(MissionType.INVASIONBOSS_PLAY_TIMES);
|
||||
typeList.add(MissionType.FAST_ADVENTUREREWARD_TIMES);
|
||||
typeList.add(MissionType.GENERAL_STORY_TIMES);
|
||||
typeList.add(MissionType.HERO_STORY_TIMES);
|
||||
eventEnumListMap.put(GameEvent.PlAY_STORY,typeList);
|
||||
eventProcessor.put(GameEvent.PlAY_STORY,new CumulationDataEventProcessor());
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ public class MonsterUtil {
|
|||
for(int j = 0; j<contents.length;j++){
|
||||
for(int k = 0;k<contents[j].length;k++){
|
||||
SMonsterConfig monster = integerSMonsterConfigMap.get(contents[j][k]);
|
||||
int monsterForce = (int)(monster.getAttack()*5+monster.getHp()*1+monster.getPhysicalDefence()*1.5+monster.getMagicDefence()*1.5);
|
||||
int monsterForce = (int)(monster.getAttack()*5+monster.getHp()*0.8+monster.getPhysicalDefence()*1.5+monster.getMagicDefence()*1.5);
|
||||
monsterCount++;
|
||||
totalMonsterForce+=monsterForce;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue