新增礼物系统

main
grimm 2025-10-14 09:48:25 +08:00
parent 33b68dbd70
commit 2a683bc8f3
4 changed files with 607 additions and 389 deletions

View File

@ -37,6 +37,7 @@ public interface GlobalItemType {
int TITLE = 29;//称号 int TITLE = 29;//称号
int TOTEM = 30;//图腾 int TOTEM = 30;//图腾
int ITEM_FRAGMENT = 31;//图腾 int ITEM_FRAGMENT = 31;//图腾
int HERO_GIFT = 56;//英雄
//物品使用类型 //物品使用类型
int NO_USE = 0 ; //不使用 int NO_USE = 0 ; //不使用

View File

@ -296,6 +296,7 @@ public class CBean2Proto {
.addAllAdjustUnLock(adjustUnLock) .addAllAdjustUnLock(adjustUnLock)
.addAllPositionSkills(positionSkillsList) .addAllPositionSkills(positionSkillsList)
.setTotemId(hero.getTotemId()) .setTotemId(hero.getTotemId())
.addAllGiftEquipIds(hero.getHeroGiftEquipList())
.build(); .build();
} }

View File

@ -728,6 +728,8 @@ public class ItemUtil {
return motherShipPlan; return motherShipPlan;
case GlobalItemType.TITLE: case GlobalItemType.TITLE:
return titleMap; return titleMap;
case GlobalItemType.HERO_GIFT:
return equipMap;
default: default:
LOGGER.error("新增类型请通知后端"); LOGGER.error("新增类型请通知后端");
return new HashMap<>(); return new HashMap<>();
@ -755,6 +757,7 @@ public class ItemUtil {
case GlobalItemType.RIDE: case GlobalItemType.RIDE:
case GlobalItemType.SELECTSecretBox: case GlobalItemType.SELECTSecretBox:
case GlobalItemType.ITEM_FRAGMENT: case GlobalItemType.ITEM_FRAGMENT:
case GlobalItemType.HERO_GIFT:
itemType = GlobalItemType.ITEM; itemType = GlobalItemType.ITEM;
break; break;
case GlobalItemType.RANDOM_ITME: case GlobalItemType.RANDOM_ITME:
@ -1425,6 +1428,7 @@ public class ItemUtil {
filter.add(GlobalItemType.EQUIP); filter.add(GlobalItemType.EQUIP);
filter.add(GlobalItemType.ESPECIAL_EQUIP); filter.add(GlobalItemType.ESPECIAL_EQUIP);
filter.add(GlobalItemType.JEWEL); filter.add(GlobalItemType.JEWEL);
filter.add(GlobalItemType.HERO_GIFT);
SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting();
int hasEquipNum = user.getEquipManager().getEquipMap().size(); int hasEquipNum = user.getEquipManager().getEquipMap().size();
@ -1435,6 +1439,9 @@ public class ItemUtil {
if (itemType == GlobalItemType.EQUIP) { if (itemType == GlobalItemType.EQUIP) {
return true; return true;
} }
// if (itemType == GlobalItemType.HERO_GIFT) {
// return true;
// }
return false; return false;
}).collect(Collectors.toSet()).size(); }).collect(Collectors.toSet()).size();
@ -1629,7 +1636,7 @@ public class ItemUtil {
SItem item = SItem.getsItemMap().get(equipId); SItem item = SItem.getsItemMap().get(equipId);
int itemType = item.getItemType(); int itemType = item.getItemType();
String msgTem = ""; String msgTem = "";
if (itemType == GlobalItemType.EQUIP) { if (itemType == GlobalItemType.EQUIP || itemType == GlobalItemType.HERO_GIFT) {
Equip equip = new Equip(user.getId(), equipId); Equip equip = new Equip(user.getId(), equipId);
equipManager.addEquip(user, equip); equipManager.addEquip(user, equip);
equipList.add(CBean2Proto.getEquipProto(equip)); equipList.add(CBean2Proto.getEquipProto(equip));