From f344ea696ecd4c341de6f98cb6fa8fbce16f90ac Mon Sep 17 00:00:00 2001 From: qinhan Date: Fri, 10 Apr 2026 16:09:34 +0800 Subject: [PATCH] feat: add icon field to equipment and pill, update bag API --- .../Frontend/src/api/equipment.ts | 1 + .../Frontend/src/api/pill.ts | 1 + .../src/views/admin/EquipmentsView.vue | 10 ++++++++-- .../Frontend/src/views/admin/PillsView.vue | 6 ++++++ Build_God_Api/Build_God_Api/DB/Equipment.cs | 6 ++++++ Build_God_Api/Build_God_Api/DB/Pill.cs | 5 +++++ .../Build_God_Api/Services/BagService.cs | 3 +++ Build_God_Game/src/api/bag.ts | 1 + .../src/assets/images/item-default.svg | 5 +++++ Build_God_Game/src/views/BagView.vue | 18 +++++++++++++++++- 10 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 Build_God_Game/src/assets/images/item-default.svg diff --git a/Build_God_Admin_Frontend/Frontend/src/api/equipment.ts b/Build_God_Admin_Frontend/Frontend/src/api/equipment.ts index 5c3712c..700bfcd 100644 --- a/Build_God_Admin_Frontend/Frontend/src/api/equipment.ts +++ b/Build_God_Admin_Frontend/Frontend/src/api/equipment.ts @@ -12,6 +12,7 @@ export interface EquipmentTemplate { attributePool: string; randomAttrCount: number; maxEnhanceLevel: number; + icon: string | null; } export interface EquipmentAttribute { diff --git a/Build_God_Admin_Frontend/Frontend/src/api/pill.ts b/Build_God_Admin_Frontend/Frontend/src/api/pill.ts index 6833acf..0df8cac 100644 --- a/Build_God_Admin_Frontend/Frontend/src/api/pill.ts +++ b/Build_God_Admin_Frontend/Frontend/src/api/pill.ts @@ -10,6 +10,7 @@ export interface Pill { requirdLevelId?: number; effectValue?: number; duration?: number; + icon?: string | null; } //获取所有 diff --git a/Build_God_Admin_Frontend/Frontend/src/views/admin/EquipmentsView.vue b/Build_God_Admin_Frontend/Frontend/src/views/admin/EquipmentsView.vue index a82b17a..fcecdec 100644 --- a/Build_God_Admin_Frontend/Frontend/src/views/admin/EquipmentsView.vue +++ b/Build_God_Admin_Frontend/Frontend/src/views/admin/EquipmentsView.vue @@ -40,7 +40,8 @@ const formData = ref>({ money: 0, attributePool: '[]', randomAttrCount: 4, - maxEnhanceLevel: 10 + maxEnhanceLevel: 10, + icon: null }) const attributePoolList = ref([]) @@ -114,7 +115,8 @@ const openDialog = (eq?: EquipmentTemplate) => { money: undefined, attributePool: '[]', randomAttrCount: 4, - maxEnhanceLevel: 10 + maxEnhanceLevel: 10, + icon: null } attributePoolList.value = [] } @@ -169,6 +171,7 @@ const saveEquipment = async () => { attributePool: formData.value.attributePool || '[]', randomAttrCount: formData.value.randomAttrCount || 4, maxEnhanceLevel: formData.value.maxEnhanceLevel || 10, + icon: formData.value.icon || null, } var result = await AddEquipmentTemplate(newOne) @@ -359,6 +362,9 @@ const fetchAttributeTypes = async () => { + + + diff --git a/Build_God_Admin_Frontend/Frontend/src/views/admin/PillsView.vue b/Build_God_Admin_Frontend/Frontend/src/views/admin/PillsView.vue index e55adec..27e59b1 100644 --- a/Build_God_Admin_Frontend/Frontend/src/views/admin/PillsView.vue +++ b/Build_God_Admin_Frontend/Frontend/src/views/admin/PillsView.vue @@ -28,6 +28,7 @@ const formData = ref({ requirdLevelId: undefined, effectValue: undefined, duration: undefined, + icon: undefined, }) const filteredPills = computed(() => { @@ -81,6 +82,7 @@ const openDialog = (pill?: Pill) => { requirdLevelId: undefined, effectValue: undefined, duration: undefined, + icon: undefined, } } showDialog.value = true @@ -118,6 +120,7 @@ const savePill = async () => { requirdLevelId: formData.value.requirdLevelId, effectValue: formData.value.effectValue, duration: formData.value.duration, + icon: formData.value.icon, } var result = await AddPill(newOne) if (result) { @@ -267,6 +270,9 @@ const fetchLevels = async () => { + + +
取消 保存 diff --git a/Build_God_Api/Build_God_Api/DB/Equipment.cs b/Build_God_Api/Build_God_Api/DB/Equipment.cs index f6e0212..78e5ab7 100644 --- a/Build_God_Api/Build_God_Api/DB/Equipment.cs +++ b/Build_God_Api/Build_God_Api/DB/Equipment.cs @@ -57,6 +57,12 @@ namespace Build_God_Api.DB /// 最大强化等级 /// public int MaxEnhanceLevel { get; set; } + + /// + /// 图标文件名 + /// + [SugarColumn(IsNullable = true)] + public string? Icon { get; set; } } /// diff --git a/Build_God_Api/Build_God_Api/DB/Pill.cs b/Build_God_Api/Build_God_Api/DB/Pill.cs index 210d9da..1a4b761 100644 --- a/Build_God_Api/Build_God_Api/DB/Pill.cs +++ b/Build_God_Api/Build_God_Api/DB/Pill.cs @@ -46,6 +46,11 @@ namespace Build_God_Api.DB /// 持续时间(秒) 如果是 0 就表示是永久 /// public decimal Duration { get; set; } + + /// + /// 图标文件名 + /// + public string? Icon { get; set; } } public enum PillType diff --git a/Build_God_Api/Build_God_Api/Services/BagService.cs b/Build_God_Api/Build_God_Api/Services/BagService.cs index 32e6e70..b702fd0 100644 --- a/Build_God_Api/Build_God_Api/Services/BagService.cs +++ b/Build_God_Api/Build_God_Api/Services/BagService.cs @@ -35,6 +35,7 @@ namespace Build_God_Api.Services public int Quantity { get; set; } public string? ItemName { get; set; } public int? ItemRarity { get; set; } + public string? Icon { get; set; } } public class CharacterBagDto @@ -187,12 +188,14 @@ namespace Build_God_Api.Services .FirstAsync(x => x.Id == item.ItemId); dto.ItemName = equipment?.Name; dto.ItemRarity = equipment != null ? (int)equipment.Rarity : null; + dto.Icon = equipment?.Icon; } else if (item.ItemType == BagItemType.Pill) { var pill = await db.Queryable() .FirstAsync(x => x.Id == item.ItemId); dto.ItemName = pill?.Name; + dto.Icon = pill?.Icon; } result.Add(dto); diff --git a/Build_God_Game/src/api/bag.ts b/Build_God_Game/src/api/bag.ts index 55b1957..ca72768 100644 --- a/Build_God_Game/src/api/bag.ts +++ b/Build_God_Game/src/api/bag.ts @@ -24,6 +24,7 @@ export interface BagItem { quantity: number itemName: string | null itemRarity: number | null + icon: string | null } export const getCharacterBag = (characterId: number): Promise => { diff --git a/Build_God_Game/src/assets/images/item-default.svg b/Build_God_Game/src/assets/images/item-default.svg new file mode 100644 index 0000000..7ba7a8a --- /dev/null +++ b/Build_God_Game/src/assets/images/item-default.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Build_God_Game/src/views/BagView.vue b/Build_God_Game/src/views/BagView.vue index 537d176..24405b7 100644 --- a/Build_God_Game/src/views/BagView.vue +++ b/Build_God_Game/src/views/BagView.vue @@ -7,6 +7,7 @@ import StarBorder from '@/components/StarBorder/StarBorder.vue' import Particles from '@/components/Particles/Particles.vue' import { ArrowLeft } from '@element-plus/icons-vue' import bagIcon from '@/assets/images/bag.svg' +import itemDefaultIcon from '@/assets/images/item-default.svg' const router = useRouter() const bagStore = useBagStore() @@ -34,6 +35,13 @@ const getItemTooltip = (item: { itemType: number; itemId: number; quantity: numb return `${item.itemName}\n类型: ${type}${rarity ? ` | 稀有度: ${rarity}` : ''}\n数量: ${item.quantity}` } +const getItemIcon = (item: { icon: string | null }) => { + if (item.icon) { + return new URL(`../assets/icons/${item.icon}`, import.meta.url).href + } + return itemDefaultIcon +} + const handleBack = () => { router.push('/game') } @@ -84,7 +92,8 @@ onMounted(() => { :show-after="300" >
-
+ +
{{ item.itemType === 1 ? '⚔️' : '💊' }}
{{ item.itemName }} @@ -231,6 +240,13 @@ onMounted(() => { margin-bottom: 8px; } +.item-icon-img { + width: 2.5rem; + height: 2.5rem; + object-fit: contain; + margin-bottom: 8px; +} + .item-name { color: #cccccc; font-size: 0.75rem;