Merge remote-tracking branch 'origin/dev-battle-fighterclass' into dev-battle-fighterclass
This commit is contained in:
+8
-11
@@ -4,16 +4,18 @@ use Battle\BattleHTML;
|
||||
use Core\Config;
|
||||
use Core\Db;
|
||||
|
||||
session_start();
|
||||
//session_start();
|
||||
$tm = microtime(true);
|
||||
|
||||
if (!isset($CRON_CORE)) {
|
||||
require_once('../../_incl_data/__config.php');
|
||||
require_once dirname(__DIR__,2) . DIRECTORY_SEPARATOR . '_incl_data/autoload.php';
|
||||
//require_once '../../_incl_data/__config.php';
|
||||
}
|
||||
|
||||
if (!isset($CRON_CORE)) {
|
||||
define('GAME', true);
|
||||
require_once('../../_incl_data/class/__db_connect.php');
|
||||
//define('GAME', true);
|
||||
require_once dirname(__DIR__,2) . DIRECTORY_SEPARATOR . '_incl_data/class/__db_connect.php';
|
||||
//require_once('../../_incl_data/class/__db_connect.php');
|
||||
}
|
||||
|
||||
function e($t): void
|
||||
@@ -208,12 +210,6 @@ if (!$isBattle) {
|
||||
$i++;
|
||||
}
|
||||
|
||||
$jslog = $btl->lookmLog() . $btl->lookLog();
|
||||
if ($jslog != '') {
|
||||
$js = $jslog . $js;
|
||||
}
|
||||
unset($jslog);
|
||||
|
||||
$atk1 = isset($btl->ga[$u->info['enemy']][$u->info['id']]) ? 1 : 0;
|
||||
$nabito = floor($btl->users[$btl->uids[$u->info['id']]]['battle_yron']);
|
||||
$expmaybe = floor($btl->users[$btl->uids[$u->info['id']]]['battle_exp']);
|
||||
@@ -233,8 +229,10 @@ if (!$isBattle) {
|
||||
$ggcode = PassGen::new();
|
||||
$mypriems = $priem->seeMy();
|
||||
|
||||
$logs = $btl->lookmLog() . $btl->lookLog();
|
||||
echo <<<HTML
|
||||
<script>
|
||||
$logs
|
||||
eatk = $atk1;
|
||||
getElementByIdInMainFrame('nabito').innerHTML = `$nabito`;
|
||||
getElementByIdInMainFrame('expmaybe').innerHTML = `$expmaybe`;
|
||||
@@ -260,7 +258,6 @@ if (!$isBattle) {
|
||||
tactic(7,'$tactic7');
|
||||
smena_alls = '0';
|
||||
ggcode='$ggcode';
|
||||
|
||||
$js
|
||||
</script>
|
||||
HTML;
|
||||
|
||||
Reference in New Issue
Block a user