av/travian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix village state

Browse Source
This commit is contained in:
Anton Vakhrushev 2020-05-19 20:07:29 +03:00
parent 42feced06e
commit f3a1e67906
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DashboardView/TaskList.vue
View File

@ -10,13 +10,13 @@
<div class="container"> <div class="container">
<table class="task-table"> <table class="task-table">
<tr v-for="task in shared.taskList" class="task-item" :class="{ 'this-village': isThisVillageTask(task) }"> <tr v-for="task in shared.taskList" class="task-item" :class="{ 'this-village': isThisVillageTask(task) }">
<td class="time-column" :title="formatDate(task.ts)">{{ formatDate(task.ts) }}</td> <td class="time-column" :title="formatDate(task.ts) + ', ' + task.id" v-text="formatDate(task.ts)"></td>
<td class="id-column" :title="task.id">{{ task.id }}</td>
<td class="actions-column"> <td class="actions-column">
<a href="#" title="Remove task" class="remove-action" v-on:click.prevent="onRemove(task.id)">&times;</a> <a href="#" title="Remove task" class="remove-action" v-on:click.prevent="onRemove(task.id)">&times;</a>
</td> </td>
<td class="name-column" :title="task.name">{{ task.name }}</td> <td class="village-column" v-text="task.args.villageId || ''"></td>
<td class="args-column" :title="JSON.stringify(task.args)">{{ JSON.stringify(task.args) }}</td> <td class="name-column" :title="task.name" v-text="task.name"></td>
<td class="args-column" :title="JSON.stringify(task.args)" v-text="JSON.stringify(task.args)"></td>
</tr> </tr>
</table> </table>
</div> </div>

8
src/DashboardView/VillageStateList.vue
View File

@ -9,7 +9,7 @@
<th class="right">Железо</th> <th class="right">Железо</th>
<th class="right">Зерно</th> <th class="right">Зерно</th>
<th class="right" title="Время до окончания добычи необходимых ресурсов">Рес.</th> <th class="right" title="Время до окончания добычи необходимых ресурсов">Рес.</th>
<th class="right" title="Время до окончания выполнения текущей задачи">Очередь</th> <th class="right" title="Время до окончания выполнения текущей задачи">Оч.</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -107,12 +107,6 @@
<td></td> <td></td>
</tr> </tr>
<resource-line
:title="'Баланс задачи:'"
:resources="villageState.required.balance"
:time1="renderGatheringTime(villageState.required.time)"
/>
<resource-line <resource-line
v-for="queueState of villageState.queues" v-for="queueState of villageState.queues"
v-bind:key="villageState.id + queueState.queue" v-bind:key="villageState.id + queueState.queue"

2
src/VillageState.ts
View File

@ -147,7 +147,7 @@ function createProductionQueueState(
return { return {
queue, queue,
isActive: tasks.length !== 0 || taskEndingTimestamp !== 0, isActive: tasks.length !== 0 || taskEndingTimestamp > timestamp(),
currentTaskFinishTimestamp: taskEndingTimestamp, currentTaskFinishTimestamp: taskEndingTimestamp,
currentTaskFinishSeconds: Math.max(taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0, 0), currentTaskFinishSeconds: Math.max(taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0, 0),
firstTask: calcResourceBalance(firstTaskResources, resources, performance), firstTask: calcResourceBalance(firstTaskResources, resources, performance),