fix 血量

back_recharge
wangyuan 2019-05-30 10:21:32 +08:00
parent fed01f8cf5
commit 84bcbd902c
7 changed files with 109 additions and 116 deletions

View File

@ -11,7 +11,7 @@ int int mut,int#int,1 int int mut,int#int,1 mut,int#int,1
108 9 10#20 0 0 2008 5#10 108 9 10#20 0 0 2008 5#10
109 10 10#20 0 0 2009 8#10 109 10 10#20 0 0 2009 8#10
110 11 10#20 0 0 2010 4#6 110 11 10#20 0 0 2010 4#6
111 12 15#20 0 0 2011 6#3 111 12 15#20 0 0 2011 4#11
112 13 15#20 0 0 2012 11#16 112 13 15#20 0 0 2012 11#16
113 14 15#20 0 0 2013 9#11 113 14 15#20 0 0 2013 9#11
114 15 15#20 0 0 2014 6#16 114 15 15#20 0 0 2014 6#16

View File

@ -1143,13 +1143,13 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
110112 0 15 110008 40010 4 null 110112 0 15 110008 40010 4 null
110113 0 15 110009 40010 4 null 110113 0 15 110009 40010 4 null
111001 0 0 null null 1 111002 111001 0 0 null null 1 111002
111002 0 11 12|111#2#11#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111002 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038
111003 0 0 null null 1 111003 111003 0 0 null null 1 111003
111004 0 11 12|111#2#11#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111004 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038
111005 0 0 null null 1 111004 111005 0 0 null null 1 111004
111006 0 11 12|111#2#11#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111006 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038
111007 0 11 12|111#2#11#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111007 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038
111008 0 11 12|111#2#11#111002|111#5#15#111003|111#10#9#111004 null 6 111038 111008 0 11 12|111#7#4#111002|111#5#15#111003|111#10#9#111004 null 6 111038
111009 0 0 null null 1 111006 111009 0 0 null null 1 111006
111010 0 0 null null 1 111007 111010 0 0 null null 1 111007
111011 0 0 null null 1 111007 111011 0 0 null null 1 111007

View File

@ -9,7 +9,7 @@ int int mut,float#float,1
310004 39 1#35 310004 39 1#35
411001 1 0.4#3#0.2#1 411001 1 0.4#3#0.2#1
411002 26 0.6#0.1#2#3 411002 26 0.6#0.1#2#3
411003 2 0.2#0.5#2 411003 2 0.2#0.5#2
411004 47 62#10#1 411004 47 62#10#1
411005 47 52#10#1 411005 47 52#10#1
411006 47 55#5#1 411006 47 55#5#1
@ -60,7 +60,7 @@ int int mut,float#float,1
440003 47 61#10#1 440003 47 61#10#1
511001 1 0.5#55#1#56 511001 1 0.5#55#1#56
511002 3 0.4#8#1 511002 3 0.4#8#1
511003 2 0.3#0.8#2 511003 2 0.3#0.8#2
511004 47 54#10#1 511004 47 54#10#1
511005 47 57#20#1 511005 47 57#20#1
511006 47 61#20#1 511006 47 61#20#1

View File

@ -1,75 +1,74 @@
Id TaskType TaskValue Reward Jump Id TaskType TaskValue Reward Jump
int int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int mut,int#int,1 mut,int#int,1 mut,int#int,1
100 20 0#15 4#1000 null 1100 1 0#50 4#1000 null
200 14 102#1 4#1001 null 2600 1 0#150 4#1001 null
300 10 0#10000 4#1002 null 4800 1 0#50 4#1002 null
400 21 2#6 4#1003 null 6300 1 0#150 4#1003 null
500 3 40#5 4#1004 null 1400 2 5#5 4#1004 null
600 16 202#1 4#1005 null 5100 2 5#5 4#1005 null
700 10 0#30000 4#1006 null 100 3 15#1 4#1006 null
800 7 0#20 4#1007 null 3800 3 0#15 4#1007 null
900 13 5000#1 4#1008 null 500 3 40#5 4#1008 null
1000 3 60#5 4#1009 null 1000 3 60#5 4#1009 null
1100 1 0#50 4#1010 null 1900 3 80#5 4#1010 null
1200 16 203#1 4#1011 null 3100 3 100#10 4#1011 null
1300 4 0#1 4#1012 null 4200 3 40#5 4#1012 null
1400 2 5#5 4#1013 null 4700 3 60#5 4#1013 null
1500 17 0#8 4#1014 null 5600 3 80#5 4#1014 null
1600 12 0#5 4#1015 null 6800 3 100#10 4#1015 null
1700 10 0#100000 4#1016 null 1300 4 0#1 4#1016 null
1800 21 3#12 4#1017 null 2900 4 0#5 4#1017 null
1900 3 80#5 4#1000 null 5000 4 0#1 4#1000 null
2000 16 206#1 4#1001 null 6600 4 0#5 4#1001 null
2100 9 0#90 4#1002 null 2500 6 0#80000 4#1002 null
2200 8 0#1500 4#1003 null 3700 6 0#150000 4#1003 null
2300 21 4#15 4#1004 null 6200 6 0#80000 4#1004 null
2400 14 215#1 4#1005 null 800 7 0#20 4#1005 null
2500 6 0#80000 4#1006 null 4500 7 0#20 4#1006 null
2600 1 0#150 4#1007 null 2200 8 0#1500 4#1007 null
2700 17 0#50 4#1008 null 3500 8 0#3000 4#1008 null
2800 21 5#15 4#1009 null 5900 8 0#1500 4#1009 null
2900 4 0#5 4#1010 null 7200 8 0#3000 4#1010 null
3000 12 0#15 4#1011 null 2100 9 0#90 4#1011 null
3100 3 100#10 4#1012 null 5800 9 0#90 4#1012 null
3200 10 0#200000 4#1013 null 300 10 0#10000 4#1013 null
3300 13 10000#8 4#1014 null 700 10 0#30000 4#1014 null
3400 16 209#1 4#1015 null 1700 10 0#100000 4#1015 null
3500 8 0#3000 4#1016 null 3200 10 0#200000 4#1016 null
3600 18 0#300 4#1017 null 4000 10 0#10000 4#1017 null
3700 6 0#150000 4#1017 null 4400 10 0#30000 4#1017 null
3800 20 0#15 4#1000 null 5400 10 0#100000 4#1000
3900 14 102#1 4#1001 null 6900 10 0#200000 4#1001 null
4000 10 0#10000 4#1002 null 1600 12 0#5 4#1002 null
4100 21 2#6 4#1003 null 3000 12 0#15 4#1003 null
4200 3 40#5 4#1004 null 5300 12 0#5 4#1004 null
4300 16 202#1 4#1005 null 6700 12 0#15 4#1005 null
4400 10 0#30000 4#1006 null 400 13 2#6 4#1006 null
4500 7 0#20 4#1007 null 1800 13 3#12 4#1007 null
4600 13 5000#1 4#1008 null 2300 13 4#15 4#1008 null
4700 3 60#5 4#1009 null 2800 13 5#15 4#1009 null
4800 1 0#50 4#1010 null 4100 13 2#6 4#1010 null
4900 16 203#1 4#1011 null 5500 13 3#12 4#1011 null
5000 4 0#1 4#1012 null 6000 13 4#15 4#1012 null
5100 2 5#5 4#1013 null 6500 13 5#15 4#1013 null
5200 17 0#8 4#1014 null 200 15 102#1 4#1014 null
5300 12 0#5 4#1015 null 2400 15 215#1 4#1015 null
5400 10 0#100000 4#1016 null 3900 15 102#1 4#1016 null
5500 21 3#12 4#1017 null 6100 15 215#1 4#1017 null
5600 3 80#5 4#1000 null 600 16 202#1 4#1000 null
5700 16 206#1 4#1001 null 1200 16 203#1 4#1001 null
5800 9 0#90 4#1002 null 2000 16 206#1 4#1002 null
5900 8 0#1500 4#1003 null 3400 16 209#1 4#1003 null
6000 21 4#15 4#1004 null 4300 16 202#1 4#1004 null
6100 14 215#1 4#1005 null 4900 16 203#1 4#1005 null
6200 6 0#80000 4#1006 null 5700 16 206#1 4#1006 null
6300 1 0#150 4#1007 null 7100 16 209#1 4#1007 null
6400 17 0#50 4#1008 null 1500 17 0#8 4#1008 null
6500 21 5#15 4#1009 null 2700 17 0#50 4#1009 null
6600 4 0#5 4#1010 null 5200 17 0#8 4#1010 null
6700 12 0#15 4#1011 null 6400 17 0#50 4#1011 null
6800 3 100#10 4#1012 null 3600 18 0#300 4#1012 null
6900 10 0#200000 4#1013 null 900 19 5000#1 4#1013 null
7000 13 10000#8 4#1014 null 3300 19 10000#8 4#1014 null
7100 16 209#1 4#1015 null 4600 19 5000#1 4#1015 null
7200 8 0#3000 4#1016 null 7000 19 10000#8 4#1016
7300 18 0#300 4#1017

View File

@ -328,8 +328,8 @@ public class CombatLogic {
MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"level not"); MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"level not");
return; return;
} }
int[][] upgradeConsume = sAdventureConfig.getUpgradeConsume(); int[] upgradeConsume = sAdventureConfig.getUpgradeConsume()[level-1];
boolean enough = ItemUtil.itemCost(user, upgradeConsume); boolean enough = ItemUtil.itemCost(user, new int[][]{upgradeConsume});
if(!enough){ if(!enough){
MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"item not"); MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"item not");
return; return;
@ -453,9 +453,6 @@ public class CombatLogic {
if(adventureBoss == null){ if(adventureBoss == null){
continue; continue;
} }
if(count>10){
break;
}
String bossId = adventureBoss.getBossId(); String bossId = adventureBoss.getBossId();
int arenaId = adventureBoss.getArenaId(); int arenaId = adventureBoss.getArenaId();
int findTime = adventureBoss.getFindTime(); int findTime = adventureBoss.getFindTime();
@ -467,6 +464,10 @@ public class CombatLogic {
removeAdventureBosseInfo.add(bossId); removeAdventureBosseInfo.add(bossId);
continue; continue;
} }
if(count>10){
myHurtInfo.remove(bossId);
break;
}
count++; count++;
User findUsser = UserManager.getUser(findUserId); User findUsser = UserManager.getUser(findUserId);
builder.addAdventureBossInfo(CommonProto.AdventureBossInfo.newBuilder() builder.addAdventureBossInfo(CommonProto.AdventureBossInfo.newBuilder()
@ -613,6 +614,7 @@ public class CombatLogic {
int fightResult=0; int fightResult=0;
int i=0; int i=0;
for(;i<fightTimes;i++){ for(;i<fightTimes;i++){
int[] checkResult = CheckFight.getInstance().checkFight(seed, sAdventureConfig.getInvasionBossTime(), getFightData, getOptionData); int[] checkResult = CheckFight.getInstance().checkFight(seed, sAdventureConfig.getInvasionBossTime(), getFightData, getOptionData);
totalHurt+= updateBossAndGetHurtForFight(checkResult, adventureBoss); totalHurt+= updateBossAndGetHurtForFight(checkResult, adventureBoss);
fightResult = checkResult[0]; fightResult = checkResult[0];
@ -624,10 +626,21 @@ public class CombatLogic {
RedisUtil.getInstence().removeMapEntrys(RedisKey.ADVENTRUEN_BOSS_INFO,"",bossId); RedisUtil.getInstence().removeMapEntrys(RedisKey.ADVENTRUEN_BOSS_INFO,"",bossId);
break; break;
} }
hps.put(0,adventureBoss.getRemainHps());
monsterByGroup = MonsterUtil.getMonsterByGroup(bossGroupId,hps);
monsterGroupList = BehaviorUtil.getFightTeamInfos(bossGroupId,monsterByGroup, Global.MONSTER_1);
//设置战斗随机种子
seed = (int)(System.currentTimeMillis()/1000);
getFightData = FightDataUtil.getFinalFightData(fightTeamInfo, monsterGroupList);
}
if(fightResult==0){
Integer hurt = RedisUtil.getInstence().getMapEntry(RedisKey.ADVENTRUEN_BOSS_OWN, Integer.toString(uid), bossId, Integer.class);
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_OWN,Integer.toString(uid),bossId,totalHurt+hurt);
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_INFO,"",bossId,adventureBoss);
} }
playerInfoManager.updateVipPrivilage(invasionBossPrivilege,i); playerInfoManager.updateVipPrivilage(invasionBossPrivilege,i);
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_OWN,Integer.toString(uid),bossId,totalHurt);
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_INFO,"",Integer.toString(uid),adventureBoss);
RedisUtil.getInstence().incrementZsetScore(RedisKey.ADVENTRUEN_BOSS_RANK,"",Integer.toString(uid),totalHurt); RedisUtil.getInstence().incrementZsetScore(RedisKey.ADVENTRUEN_BOSS_RANK,"",Integer.toString(uid),totalHurt);
FightInfoProto.AdventurenBossChallengeResponse build = builder.setHurtNums(totalHurt) FightInfoProto.AdventurenBossChallengeResponse build = builder.setHurtNums(totalHurt)
.setFightResult(fightResult) .setFightResult(fightResult)

View File

@ -453,6 +453,8 @@ public class HeroLogic {
for(Map.Entry<Integer,Integer> item : heroAllAttribute.entrySet() ){ for(Map.Entry<Integer,Integer> item : heroAllAttribute.entrySet() ){
LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() ); LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() );
} }
int force= calHeoForce(user, hero, true);
LOGGER.info("the force {}",force);
//发送成功消息 //发送成功消息
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,null,true); MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,null,true);

View File

@ -92,8 +92,9 @@ public class FightDataUtil {
unitData.set("passivity", getPassivity(unitSkill)); unitData.set("passivity", getPassivity(unitSkill));
} }
CommonProto.FightUnitInfo fightUnitList = data.getFightUnitList(0);
unitData.set("property", getMonsterProperty(sMonster)); String property = fightUnitList.getProperty();
unitData.set("property", getMonsterProperty(property));
enemyData.rawset(i+1, unitData); enemyData.rawset(i+1, unitData);
} }
@ -139,37 +140,15 @@ public class FightDataUtil {
* -- {,,,,,,,%,%,%,%,%,%,% * -- {,,,,,,,%,%,%,%,%,%,%
* -- ,%,%,%,%,%,%,% * -- ,%,%,%,%,%,%,%
* -- ,%,%,%,%,%} * -- ,%,%,%,%,%}
* @param sMonster
* @return * @return
*/ */
private static LuaValue getMonsterProperty(SMonsterConfig sMonster) { private static LuaValue getMonsterProperty(String propertyString) {
LuaValue property = new LuaTable(); LuaValue property = new LuaTable();
property.rawset(1, LuaValue.valueOf(sMonster.getLevel())); int index =1;
property.rawset(2, LuaValue.valueOf(sMonster.getHp())); for(String value : propertyString.split("#")){
property.rawset(3, LuaValue.valueOf(sMonster.getHp())); property.rawset(index++, LuaValue.valueOf(value));
property.rawset(4, LuaValue.valueOf(sMonster.getAttack())); }
property.rawset(5, LuaValue.valueOf(sMonster.getPhysicalDefence()));
property.rawset(6, LuaValue.valueOf(sMonster.getMagicDefence()));
property.rawset(7, LuaValue.valueOf(sMonster.getSpeed()));
property.rawset(8, LuaValue.valueOf(sMonster.getDamageBocusFactor()));
property.rawset(9, LuaValue.valueOf(sMonster.getDamageReduceFactor()));
property.rawset(10, LuaValue.valueOf(sMonster.getHit()));
property.rawset(11, LuaValue.valueOf(sMonster.getDodge()));
property.rawset(12, LuaValue.valueOf(sMonster.getCritFactor()));
property.rawset(13, LuaValue.valueOf(sMonster.getCritDamageFactor()));
property.rawset(14, LuaValue.valueOf(sMonster.getAntiCritDamageFactor()));
property.rawset(15, LuaValue.valueOf(sMonster.getTreatFacter()));
property.rawset(16, LuaValue.valueOf(sMonster.getCureFacter()));
property.rawset(17, LuaValue.valueOf(sMonster.getDifferDemonsBocusFactor()));
property.rawset(18, LuaValue.valueOf(sMonster.getDifferDemonsReduceFactor()));
property.rawset(19, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[0]));
property.rawset(20, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[1]));
property.rawset(21, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[2]));
property.rawset(22, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[3]));
property.rawset(23, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[4]));
property.rawset(24, LuaValue.valueOf(sMonster.getElementDamageReduceFactor()[5]));
property.rawset(25, String.valueOf(sMonster.getElementDamageBonusFactor()));
return property; return property;
} }