duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge latest duckie main with login UI

Browse Source
This commit is contained in:
Lorenzune
2026-04-21 11:53:30 +02:00
parent 964ffa6c1f 8a20ee49a4
commit 726d1cc5c8
39 changed files with 1724 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/avatar-editor/useAvatarEditor.ts
+5
View File
@@ -71,6 +71,10 @@ const useAvatarEditorState = () =>
setMaxPaletteCount(partItem.maxPaletteCount || 1);
selectPart(setType, partId);
// Pet (pt) and Misc (mc) cannot be equipped together — equipping one unequips the other.
if(setType === AvatarFigurePartType.PET) selectPart(AvatarFigurePartType.MISC, -1);
else if(setType === AvatarFigurePartType.MISC) selectPart(AvatarFigurePartType.PET, -1);
}, [ activeModel, selectPart ]);
const selectEditorColor = useCallback((setType: string, paletteId: number, colorId: number) =>
@@ -316,6 +320,7 @@ const useAvatarEditorState = () =>
newAvatarModels[AvatarEditorFigureCategory.TORSO] = [ AvatarFigurePartType.CHEST, AvatarFigurePartType.CHEST_PRINT, AvatarFigurePartType.COAT_CHEST, AvatarFigurePartType.CHEST_ACCESSORY ].map(setType => buildCategory(setType, buildModeDefault));
newAvatarModels[AvatarEditorFigureCategory.LEGS] = [ AvatarFigurePartType.LEGS, AvatarFigurePartType.SHOES, AvatarFigurePartType.WAIST_ACCESSORY ].map(setType => buildCategory(setType, buildModeDefault));
newAvatarModels[AvatarEditorFigureCategory.PETS] = [ AvatarFigurePartType.PET ].map(setType => buildCategory(setType)).filter(Boolean);
newAvatarModels[AvatarEditorFigureCategory.MISC] = [ AvatarFigurePartType.MISC ].map(setType => buildCategory(setType)).filter(Boolean);
newAvatarModels[AvatarEditorFigureCategory.NFT] = [
AvatarFigurePartType.HEAD,
AvatarFigurePartType.HAIR,
src/hooks/catalog/useCatalog.ts
+2 -2
View File
@@ -609,7 +609,7 @@ const useCatalogState = () =>
if(!products.length) continue;
const purchasableOffer = new Offer(offer.offerId, offer.localizationId, offer.rent, offer.priceCredits, offer.priceActivityPoints, offer.priceActivityPointsType, offer.giftable, offer.clubLevel, products, offer.bundlePurchaseAllowed);
const purchasableOffer = new Offer(offer.offerId, offer.localizationId, offer.rent, offer.priceCredits, offer.priceActivityPoints, offer.priceActivityPointsType, offer.giftable, offer.clubLevel, products, offer.bundlePurchaseAllowed, offer.itemIds, offer.haveOffer);
cacheResolvedOffer(purchasableOffer);
@@ -680,7 +680,7 @@ const useCatalogState = () =>
products.push(new Product(product.productType, product.furniClassId, product.extraParam, product.productCount, productData, furnitureData, product.uniqueLimitedItem, product.uniqueLimitedSeriesSize, product.uniqueLimitedItemsLeft));
}
const offer = new Offer(offerData.offerId, offerData.localizationId, offerData.rent, offerData.priceCredits, offerData.priceActivityPoints, offerData.priceActivityPointsType, offerData.giftable, offerData.clubLevel, products, offerData.bundlePurchaseAllowed);
const offer = new Offer(offerData.offerId, offerData.localizationId, offerData.rent, offerData.priceCredits, offerData.priceActivityPoints, offerData.priceActivityPointsType, offerData.giftable, offerData.clubLevel, products, offerData.bundlePurchaseAllowed, offerData.itemIds, offerData.haveOffer);
cacheResolvedOffer(offer);
const matchingNodes = getNodesByOfferId(offer.offerId, true) || getNodesByOfferId(offer.offerId);