Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
56d87dbaf6
|
@ -989,7 +989,7 @@ public class HeroLogic {
|
|||
MessageUtil.sendErrorResponse(iSession,0,msgId,"");
|
||||
return;
|
||||
}
|
||||
if (hasHeroNum + composeNum >= gameSetting.getHeroNumlimit()){
|
||||
if (hasHeroNum + composeNum > gameSetting.getHeroNumlimit()){
|
||||
MessageUtil.sendErrorResponse(iSession,0,msgId,"英雄已达上限");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -98,6 +98,63 @@ public class ItemUtil {
|
|||
return dropBuilder;
|
||||
}
|
||||
|
||||
/**
|
||||
* 掉落走邮件
|
||||
* @param user
|
||||
* @param dropGroupIds
|
||||
* @param dropRatio
|
||||
* @param isMapping
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public static String getMailReward (int[] dropGroupIds,float dropRatio) throws Exception {
|
||||
Map<Integer, Integer> itemMap = new HashMap<>();
|
||||
Map<Integer, Integer> cardMap = new HashMap<>();
|
||||
Map<Integer, Integer> equipMap = new HashMap<>();
|
||||
Map<Integer,Integer> randomMap = new HashMap<>();
|
||||
for (int dropGroupId :dropGroupIds){
|
||||
SRewardGroup sRewardGroup = SRewardGroup.getsRewardItemMap().get(dropGroupId);
|
||||
if (sRewardGroup == null){
|
||||
continue;
|
||||
}
|
||||
selectDrop(sRewardGroup,itemMap,cardMap,equipMap,randomMap,dropRatio);
|
||||
}
|
||||
return getReward(itemMap,cardMap,equipMap,randomMap);
|
||||
}
|
||||
|
||||
private static String getReward(Map<Integer, Integer> itemMap,Map<Integer, Integer> cardMap,Map<Integer, Integer> equipMap, Map<Integer,Integer> randomMap) {
|
||||
StringBuilder reward= new StringBuilder();
|
||||
for (Map.Entry<Integer, Integer> entry : itemMap.entrySet()){
|
||||
if (reward.length() == 0){
|
||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||
}else{
|
||||
reward.append("|").append(entry.getKey()).append("#").append(entry.getValue());
|
||||
}
|
||||
}
|
||||
for (Map.Entry<Integer, Integer> entry : cardMap.entrySet()){
|
||||
if (reward.length() == 0){
|
||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||
}else{
|
||||
reward.append("|").append(entry.getKey()).append("#").append(entry.getValue());
|
||||
}
|
||||
}
|
||||
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()){
|
||||
if (reward.length() == 0){
|
||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||
}else{
|
||||
reward.append("|").append(entry.getKey()).append("#").append(entry.getValue());
|
||||
}
|
||||
}
|
||||
for (Map.Entry<Integer, Integer> entry : randomMap.entrySet()){
|
||||
if (reward.length() == 0){
|
||||
reward = new StringBuilder(entry.getKey() + "#" + entry.getValue());
|
||||
}else{
|
||||
reward.append("|").append(entry.getKey()).append("#").append(entry.getValue());
|
||||
}
|
||||
}
|
||||
return reward.toString();
|
||||
}
|
||||
|
||||
private static void selectItemArr(int[][] itemArr, Map<Integer, Integer> cardMap, Map<Integer, Integer>
|
||||
itemMap,Map<Integer,Integer> equipMap,Map<Integer,Integer> randomMap) {
|
||||
for (int[] items : itemArr){
|
||||
|
|
Loading…
Reference in New Issue