Merge branch 'main' into day-24-packing

This commit is contained in:
thepaperpilot 2022-12-24 09:47:09 -06:00
commit 25322ab9e6
2 changed files with 9 additions and 2 deletions

View file

@ -912,6 +912,13 @@ const factory = createLayer(id, () => {
} }
while (times > 0) { while (times > 0) {
if (
!Object.values(allToys).some(i =>
Decimal.gte(i.value, computedToyMultiplier.value)
)
) {
return;
}
while (Decimal.lt(value[toysIndex].value, computedToyMultiplier.value)) { while (Decimal.lt(value[toysIndex].value, computedToyMultiplier.value)) {
toysIndex = (toysIndex + 1) % value.length; toysIndex = (toysIndex + 1) % value.length;
} }

View file

@ -1,7 +1,7 @@
<template> <template>
<panZoom <panZoom
v-if="visibility !== Visibility.None" v-if="unref(visibility) !== Visibility.None"
v-show="visibility === Visibility.Visible" v-show="unref(visibility) === Visibility.Visible"
:style="[ :style="[
{ {
width, width,