Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
484298240c
|
@ -1,6 +1,8 @@
|
||||||
package com.ljsd.jieling.logic.fight.passiveSkillCal;
|
package com.ljsd.jieling.logic.fight.passiveSkillCal;
|
||||||
|
|
||||||
import com.ljsd.jieling.core.GlobalsDef;
|
import com.ljsd.jieling.core.GlobalsDef;
|
||||||
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import config.SCHero;
|
import config.SCHero;
|
||||||
import config.SPropertyConfig;
|
import config.SPropertyConfig;
|
||||||
|
|
||||||
|
@ -52,10 +54,15 @@ public enum PassiveskillCalEnum {
|
||||||
heroSkillAdMap.put(sPropertyConfig.getPropertyId(),heroSkillAdMap.getOrDefault(sPropertyConfig.getPropertyId(), Long.valueOf(0))+extraValue);
|
heroSkillAdMap.put(sPropertyConfig.getPropertyId(),heroSkillAdMap.getOrDefault(sPropertyConfig.getPropertyId(), Long.valueOf(0))+extraValue);
|
||||||
}),
|
}),
|
||||||
HEROAFTER100ADD(171,(config,hero,heroSkillAdMap)->{
|
HEROAFTER100ADD(171,(config,hero,heroSkillAdMap)->{
|
||||||
|
int uid = Integer.parseInt(hero.getId().substring(0, 8));
|
||||||
|
User user = UserManager.getUserInMem(uid);
|
||||||
|
if (user == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
float[] value = config.getValue();
|
float[] value = config.getValue();
|
||||||
int battlePropertyId = (int) value[0];
|
int battlePropertyId = (int) value[0];
|
||||||
SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByBattlePID(battlePropertyId);
|
SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByBattlePID(battlePropertyId);
|
||||||
int level = hero.getOriginalLevel();
|
int level = hero.getLevel(user.getHeroManager());
|
||||||
int times=level-100;
|
int times=level-100;
|
||||||
if(times<=0){
|
if(times<=0){
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue