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

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
back_recharge
jiahuiwen 2020-10-21 17:54:16 +08:00
commit bc486f6f9b
2 changed files with 8 additions and 2 deletions

View File

@ -2077,7 +2077,6 @@ public class HeroLogic{
}
return quality;
}
//
public void pokemonAdvanced(ISession session,int pokemonId) throws Exception {
// int uid = session.getUid();

View File

@ -3,6 +3,7 @@ package config;
import manager.STableManager;
import manager.Table;
import java.util.HashMap;
import java.util.Map;
@Table(name ="SpiritAnimalLevel")
@ -25,7 +26,13 @@ public class SSpiritAnimalLevel implements BaseConfig {
@Override
public void init() throws Exception {
Map<Integer,Map<Integer,SSpiritAnimalLevel>> tempConfigByQualityAndLevel = new HashMap<>();
Map<Integer, SSpiritAnimalLevel> config = STableManager.getConfig(SSpiritAnimalLevel.class);
for(Map.Entry<Integer,SSpiritAnimalLevel> entry:config.entrySet()){
SSpiritAnimalLevel value = entry.getValue();
tempConfigByQualityAndLevel.computeIfAbsent(value.getQuality(),n->new HashMap<>()).put(value.getLevel(),value);
}
configByQualityAndLevel = tempConfigByQualityAndLevel;
}