devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: 세력일람 분석에서 자동수행턴을 반영하지 않는 버그 수정

Browse Source
This commit is contained in:
Hide_D
2022-02-05 07:43:27 +00:00
committed by Gitea
parent 8ff6bff252
commit cd1ccfadaf
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_kingdomList.php
+2 -1
View File
@@ -10,7 +10,7 @@ $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
increaseRefresh("세력일람", 2); increaseRefresh("세력일람", 2);
$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID); $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
@@ -33,6 +33,7 @@ if ($con >= 2) {
<?= WebUtil::printCSS('../d_shared/common.css') ?> <?= WebUtil::printCSS('../d_shared/common.css') ?>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" /> <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
<?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?> <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
<?= WebUtil::printStaticValues($gameStor->getValues(['killturn', 'autorun_user', 'turnterm'])) ?>
</head> </head>
<body> <body>
hwe/ts/extKingdoms.ts
+13 -2
View File
@@ -3,6 +3,13 @@ import { unwrap } from '@util/unwrap';
import axios from 'axios'; import axios from 'axios';
import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
declare const killturn: number;
declare const autorun_user: undefined|null|{
limit_minutes: number;
options: Record<string, number>;
};
declare const turnterm: number;
type KingdomGeneral = { type KingdomGeneral = {
html: JQuery<HTMLElement>, html: JQuery<HTMLElement>,
장수명: string 장수명: string
@@ -83,6 +90,10 @@ $(function () {
} }
const runAnalysis = async function () { const runAnalysis = async function () {
let realKillturn = killturn;
if(autorun_user && autorun_user.limit_minutes){
realKillturn -= autorun_user.limit_minutes / turnterm;
}
const $content = $('#on_mover .content'); const $content = $('#on_mover .content');
try { try {
const response = await axios({ url: 'a_genList.php', method: 'get', responseType: 'text' }); const response = await axios({ url: 'a_genList.php', method: 'get', responseType: 'text' });
@@ -197,7 +208,7 @@ $(function () {
//const 종능 = val.통 + val.무 + val.지; //const 종능 = val.통 + val.무 + val.지;
console.log(val); console.log(val);
if (종류명 != '무능' && 종류명 != '무지') { if (종류명 != '무능' && 종류명 != '무지') {
if (val.삭턴 >= 80 && !val.NPC) { if (val.삭턴 >= realKillturn && !val.NPC) {
전투유저장수 += 1; 전투유저장수 += 1;
통솔합 += val.통; 통솔합 += val.통;
@@ -214,7 +225,7 @@ $(function () {
const $obj2 = $('<span></span>'); const $obj2 = $('<span></span>');
$obj.html(val.장수명); $obj.html(val.장수명);
if (!val.NPC && val.삭턴 < 80) { if (!val.NPC && val.삭턴 < realKillturn) {
$obj.css('text-decoration', 'line-through'); $obj.css('text-decoration', 'line-through');
삭턴장수 += 1; 삭턴장수 += 1;
} }