generated from root/miduo_server
新增礼物系统
parent
33b68dbd70
commit
2a683bc8f3
File diff suppressed because it is too large
Load Diff
|
@ -37,6 +37,7 @@ public interface GlobalItemType {
|
|||
int TITLE = 29;//称号
|
||||
int TOTEM = 30;//图腾
|
||||
int ITEM_FRAGMENT = 31;//图腾
|
||||
int HERO_GIFT = 56;//英雄
|
||||
|
||||
//物品使用类型
|
||||
int NO_USE = 0 ; //不使用
|
||||
|
|
|
@ -296,6 +296,7 @@ public class CBean2Proto {
|
|||
.addAllAdjustUnLock(adjustUnLock)
|
||||
.addAllPositionSkills(positionSkillsList)
|
||||
.setTotemId(hero.getTotemId())
|
||||
.addAllGiftEquipIds(hero.getHeroGiftEquipList())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
|
@ -728,6 +728,8 @@ public class ItemUtil {
|
|||
return motherShipPlan;
|
||||
case GlobalItemType.TITLE:
|
||||
return titleMap;
|
||||
case GlobalItemType.HERO_GIFT:
|
||||
return equipMap;
|
||||
default:
|
||||
LOGGER.error("新增类型请通知后端");
|
||||
return new HashMap<>();
|
||||
|
@ -755,6 +757,7 @@ public class ItemUtil {
|
|||
case GlobalItemType.RIDE:
|
||||
case GlobalItemType.SELECTSecretBox:
|
||||
case GlobalItemType.ITEM_FRAGMENT:
|
||||
case GlobalItemType.HERO_GIFT:
|
||||
itemType = GlobalItemType.ITEM;
|
||||
break;
|
||||
case GlobalItemType.RANDOM_ITME:
|
||||
|
@ -1425,6 +1428,7 @@ public class ItemUtil {
|
|||
filter.add(GlobalItemType.EQUIP);
|
||||
filter.add(GlobalItemType.ESPECIAL_EQUIP);
|
||||
filter.add(GlobalItemType.JEWEL);
|
||||
filter.add(GlobalItemType.HERO_GIFT);
|
||||
|
||||
SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting();
|
||||
int hasEquipNum = user.getEquipManager().getEquipMap().size();
|
||||
|
@ -1435,6 +1439,9 @@ public class ItemUtil {
|
|||
if (itemType == GlobalItemType.EQUIP) {
|
||||
return true;
|
||||
}
|
||||
// if (itemType == GlobalItemType.HERO_GIFT) {
|
||||
// return true;
|
||||
// }
|
||||
return false;
|
||||
}).collect(Collectors.toSet()).size();
|
||||
|
||||
|
@ -1629,7 +1636,7 @@ public class ItemUtil {
|
|||
SItem item = SItem.getsItemMap().get(equipId);
|
||||
int itemType = item.getItemType();
|
||||
String msgTem = "";
|
||||
if (itemType == GlobalItemType.EQUIP) {
|
||||
if (itemType == GlobalItemType.EQUIP || itemType == GlobalItemType.HERO_GIFT) {
|
||||
Equip equip = new Equip(user.getId(), equipId);
|
||||
equipManager.addEquip(user, equip);
|
||||
equipList.add(CBean2Proto.getEquipProto(equip));
|
||||
|
|
Loading…
Reference in New Issue