Merge branch 'dev_dh_fourSpirit2' into master_test_gn
commit
70b92f1b91
|
|
@ -870,6 +870,9 @@ public class BuyGoodsNewLogic {
|
||||||
if(id >= 7300 && id <= 7304){
|
if(id >= 7300 && id <= 7304){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if(id >= 1100 && id <= 1104){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1148,6 +1148,8 @@ public class ItemUtil {
|
||||||
StringBuilder reward = new StringBuilder();
|
StringBuilder reward = new StringBuilder();
|
||||||
List<CommonProto.Equip> equipList = new CopyOnWriteArrayList<>();
|
List<CommonProto.Equip> equipList = new CopyOnWriteArrayList<>();
|
||||||
List<CommonProto.Equip> jewelList = new CopyOnWriteArrayList<>();
|
List<CommonProto.Equip> jewelList = new CopyOnWriteArrayList<>();
|
||||||
|
// jewelMap 为了做宝物礼包推送<宝物品质, 数量>
|
||||||
|
Map<Integer, Integer> jewelMap = new HashMap<>();
|
||||||
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
|
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
|
||||||
int itemType = SItem.getsItemMap().get(entry.getKey()).getItemType();
|
int itemType = SItem.getsItemMap().get(entry.getKey()).getItemType();
|
||||||
if(!filter.contains(itemType)){
|
if(!filter.contains(itemType)){
|
||||||
|
|
@ -1163,7 +1165,7 @@ public class ItemUtil {
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
addEquip(user, entry.getKey(), equipList,jewelList);
|
addEquip(user, entry.getKey(), jewelMap,jewelList);
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.GET_TREASURE.getType(),entry.getKey(),reason);
|
ReportUtil.onReportEvent(user,ReportEventEnum.GET_TREASURE.getType(),entry.getKey(),reason);
|
||||||
// KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1);
|
// KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1);
|
||||||
}
|
}
|
||||||
|
|
@ -1174,6 +1176,15 @@ public class ItemUtil {
|
||||||
MailLogic.getInstance().sendMail(user.getId(), title, content, reward.toString(), nowTime, Global.MAIL_EFFECTIVE_TIME);
|
MailLogic.getInstance().sendMail(user.getId(), title, content, reward.toString(), nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||||
MessageUtil.nofityBagIsFull(user);
|
MessageUtil.nofityBagIsFull(user);
|
||||||
}
|
}
|
||||||
|
if (!jewelMap.isEmpty()) {
|
||||||
|
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
|
if (sessionByUid != null) {
|
||||||
|
for (Map.Entry<Integer, Integer> entry : jewelMap.entrySet()) {
|
||||||
|
BuyGoodsNewLogic.openPush(sessionByUid, user, PushRechargeType.BAOWU_PINGZHI.getType(), entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
dropBuilder.addAllEquipId(equipList);
|
dropBuilder.addAllEquipId(equipList);
|
||||||
dropBuilder.addAllSoulEquip(jewelList);
|
dropBuilder.addAllSoulEquip(jewelList);
|
||||||
}
|
}
|
||||||
|
|
@ -1198,7 +1209,7 @@ public class ItemUtil {
|
||||||
return reward.toString();
|
return reward.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addEquip(User user,int equipId ,List<CommonProto.Equip> equipList,List<CommonProto.Equip> jewelList) throws Exception {
|
private static void addEquip(User user,int equipId ,Map<Integer, Integer> jewels,List<CommonProto.Equip> jewelList) throws Exception {
|
||||||
EquipManager equipManager = user.getEquipManager();
|
EquipManager equipManager = user.getEquipManager();
|
||||||
SItem item = SItem.getsItemMap().get(equipId);
|
SItem item = SItem.getsItemMap().get(equipId);
|
||||||
int itemType = item.getItemType();
|
int itemType = item.getItemType();
|
||||||
|
|
@ -1208,11 +1219,10 @@ public class ItemUtil {
|
||||||
equipManager.addEquip(user,equip);
|
equipManager.addEquip(user,equip);
|
||||||
jewelList.add(CBean2Proto.getEquipProto(equip));
|
jewelList.add(CBean2Proto.getEquipProto(equip));
|
||||||
msgTem="lamp_lottery_equip_content";
|
msgTem="lamp_lottery_equip_content";
|
||||||
|
if (!jewels.containsKey(item.getQuantity())) {
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
jewels.put(item.getQuantity(), 0);
|
||||||
if (sessionByUid != null) {
|
|
||||||
BuyGoodsNewLogic.openPush(sessionByUid, user, PushRechargeType.BAOWU_PINGZHI.getType(), item.getQuantity(), 1);
|
|
||||||
}
|
}
|
||||||
|
jewels.put(item.getQuantity(), jewels.get(item.getQuantity()) + 1);
|
||||||
}
|
}
|
||||||
if (item.getQuantity() >= SSpecialConfig.getIntegerValue(msgTem+"_parm")) {
|
if (item.getQuantity() >= SSpecialConfig.getIntegerValue(msgTem+"_parm")) {
|
||||||
String nickName = user.getPlayerInfoManager().getNickName();
|
String nickName = user.getPlayerInfoManager().getNickName();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue