fix: 修复抽卡结果modal框内会带上抽卡总数的问题

pull/81/head
moonrailgun 3 years ago
parent 479c865ee8
commit 763c060bec

@ -4,20 +4,33 @@ import { WishResultText } from './WishResultText';
interface GachaResultProps {
gachaResult: AppWishResult;
withCount: boolean;
}
export const GachaResult: React.FC<GachaResultProps> = React.memo((props) => {
const { gachaResult } = props;
const { gachaResult, withCount } = props;
return (
<div>
<div style={{ color: '#c17a4e' }}>
<WishResultText label="5星" items={gachaResult.ssr} />
<WishResultText
label="5星"
items={gachaResult.ssr}
withCount={withCount}
/>
</div>
<div style={{ color: '#865cad' }}>
<WishResultText label="4星" items={gachaResult.sr} />
<WishResultText
label="4星"
items={gachaResult.sr}
withCount={withCount}
/>
</div>
<div>
<WishResultText label="3星" items={gachaResult.r} />
<WishResultText
label="3星"
items={gachaResult.r}
withCount={withCount}
/>
</div>
</div>
);

@ -13,6 +13,7 @@ export const WishResultModal: React.FC<{ items: AppGachaItem[] }> = React.memo(
sr: items.filter((i) => i.rarity === 4),
r: items.filter((i) => i.rarity === 3),
}}
withCount={false}
/>
</ModalWrapper>
);

@ -2,17 +2,23 @@ import { AppGachaItem } from 'genshin-gacha-kit';
import { getAppGachaItemText } from '../utils';
import React from 'react';
function pickName(item: AppGachaItem) {
return item.name;
}
export const WishResultText: React.FC<{
label: string;
items: AppGachaItem[];
}> = React.memo(({ label, items }) => {
withCount: boolean;
}> = React.memo(({ label, items, withCount }) => {
if (items.length === 0) {
return null;
}
return (
<span>
{label}: {items.map(getAppGachaItemText).join(',')}
{label}:{' '}
{items.map(withCount ? getAppGachaItemText : pickName).join(', ')}
</span>
);
});

@ -42,7 +42,7 @@ export const GachaPool: React.FC<{
<div>
<div>: {gachaCount} </div>
<GachaResult gachaResult={gachaResult} />
<GachaResult gachaResult={gachaResult} withCount={true} />
</div>
)}

Loading…
Cancel
Save