Merge branch 'master_prb_gn' into master_test_gn
commit
0579b663eb
|
@ -638,6 +638,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
if (strongMark == 1){
|
if (strongMark == 1){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
user.getPlayerInfoManager().setEquipStrongMark(1);
|
||||||
|
|
||||||
// 消耗的道具合集
|
// 消耗的道具合集
|
||||||
ArrayList<int[][]> cost = new ArrayList<>();
|
ArrayList<int[][]> cost = new ArrayList<>();
|
||||||
|
@ -654,9 +655,11 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
Map<Integer, SEquipRankUp> rankUp = SEquipRankUp.lvMap;
|
Map<Integer, SEquipRankUp> rankUp = SEquipRankUp.lvMap;
|
||||||
List<int[][]> rankUpList = rankUp.values().stream().filter(v -> v.getid() < equipHomeRankUp).map(v -> v.getOldCost()).collect(Collectors.toList());
|
List<int[][]> rankUpList = rankUp.values().stream().filter(v -> v.getid() < equipHomeRankUp).map(v -> v.getOldCost()).collect(Collectors.toList());
|
||||||
cost.addAll(rankUpList);
|
cost.addAll(rankUpList);
|
||||||
|
if (cost.isEmpty()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ItemUtil.drop(user, cost, BIReason.ZHAIXINGGE_BAKCUP_ITEM);
|
ItemUtil.drop(user, cost, BIReason.ZHAIXINGGE_BAKCUP_ITEM);
|
||||||
user.getPlayerInfoManager().setEquipStrongMark(1);
|
|
||||||
LOGGER.info("===========摘星阁装备道具返还,玩家id:{},装备列表:{},突破等级:{},返还道具:{}",user.getId(),equipIntensify,equipHomeRankUp,rankUpList.toArray(),JSON.toJSONString(cost));
|
LOGGER.info("===========摘星阁装备道具返还,玩家id:{},装备列表:{},突破等级:{},返还道具:{}",user.getId(),equipIntensify,equipHomeRankUp,rankUpList.toArray(),JSON.toJSONString(cost));
|
||||||
|
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("zhaixingge_mail_title");
|
String title = SErrorCodeEerverConfig.getI18NMessage("zhaixingge_mail_title");
|
||||||
|
|
Loading…
Reference in New Issue