Merge branch 'main' into day-20-factory

This commit is contained in:
ducdat0507 2022-12-18 10:58:50 +07:00
commit c92eb6ab3b
11 changed files with 46 additions and 29 deletions

View file

@ -207,3 +207,9 @@ export default defineComponent({
pointer-events: none; pointer-events: none;
} }
</style> </style>
<style>
.layer-tab.minimized > * > .desc {
color: var(--accent1);
font-size: 30px;
}
</style>

View file

@ -617,9 +617,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(boxes.value)} {boxes.displayName} {name}{" "}
<span class="desc">{format(boxes.value)} {boxes.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -613,9 +613,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(cloth.value)} {cloth.displayName} {name}{" "}
<span class="desc">{format(cloth.value)} {cloth.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -1110,9 +1110,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(coal.value)} {coal.displayName} {name}{" "}
<span class="desc">{format(coal.value)} {coal.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -283,9 +283,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(letters.value)} {letters.displayName} {name}{" "}
<span class="desc">{format(letters.value)} {letters.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -721,9 +721,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(metal.value)} {metal.displayName} {name}{" "}
<span class="desc">{format(metal.value)} {metal.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -1283,9 +1283,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
}), }),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(oil.value)} {oil.displayName} {name}{" "}
<span class="desc">{format(oil.value)} {oil.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -493,9 +493,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(paper.value)} {paper.displayName} {name}{" "}
<span class="desc">{format(paper.value)} {paper.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -356,9 +356,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(plastic.value)} {plastic.displayName} {name}{" "}
<span class="desc">{format(plastic.value)} {plastic.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -863,9 +863,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(logs.value)} {logs.displayName} {name}{" "}
<span class="desc">{format(logs.value)} {logs.displayName}</span>
</div> </div>
)) )),
}; };
}); });

View file

@ -333,9 +333,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name} - {format(foundationProgress.value)}% {foundationProgress.displayName} {name}{" "}
<span class="desc">{formatWhole(foundationProgress.value)}% {foundationProgress.displayName}</span>
</div> </div>
)) )),
}; };
}); });