new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity

dev-php74-utf8 #31

Merged
lopar merged 15 commits from dev-php74-utf8 into master 2023-01-11 13:52:04 +00:00
Conversation 0 Commits 15 Files Changed 3588 +10 -23
6 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c071d2d293 - Show all commits

23
_incl_data/class/User.php
View File

@ -607,17 +607,13 @@ class User
if (!$type) {
if (($this->info['align'] > 0 || $this->info['clan'] > 0 || $this->info['level'] > 12) && $this->info['align'] != 2) {
$r = ($this->info['level'] - 6) * 0.04;
if (date('m') >= 6 || date('m') <= 8) {
$r = round($r * 2, 2);
} elseif (date('w') == 0 || date('w') == 6) {
if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
$r = round($r * 2, 2);
}
$r = $r . ' ЕКР.';
} else {
$r = $this->info['level'];
if (date('m') >= 6 || date('m') <= 8) {
$r = round($r * 2, 2);
} elseif (date('w') == 0 || date('w') == 6) {
if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
$r = round($r * 2, 2);
}
$r = $r . ' КР.';
@ -625,17 +621,13 @@ class User
} else {
if (($this->info['align'] > 0 || $this->info['clan'] > 0 || $this->info['level'] > 12) && $this->info['align'] != 2) {
$r = ($this->info['level'] - 6) * 0.04;
if (date('m') >= 6 || date('m') <= 8) {
$r = round($r * 2, 2);
} elseif (date('w') == 0 || date('w') == 6) {
if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
$r = round($r * 2, 2);
}
$r = [2, $r];
} else {
$r = $this->info['level'];
if (date('m') >= 6 || date('m') <= 8) {
$r = round($r * 2, 2);
} elseif (date('w') == 0 || date('w') == 6) {
if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
$r = round($r * 2, 2);
}
$r = [1, $r];
@ -903,12 +895,6 @@ class User
return $e;
}
/**@deprecated do nothing */
public function sys_see($type): string
{
return '';
}
public static function start(): User
{
if (!isset(self::$flag_one)) {
@ -10311,6 +10297,7 @@ LIMIT 1'
}
if ($u['admin'] > 0) {
mysql_query(
'UPDATE `stats` SET
`tactic1` = 25,

2
jx/battle/refresh.php
View File

@ -236,7 +236,7 @@ if (($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' || isset($CRON_CORE))
$i++;
}
$atk1 = 0;
$rsys = $u->sys_see(0);
$rsys = '';
if ($rsys != '') {
$js .= $rsys;
}

2
jx/battle/refresh1.php
View File

@ -188,7 +188,7 @@
$i++;
}
$atk1 = 0;
if(!isset($CRON_CORE)) {$rsys = $u->sys_see(0);}
if(!isset($CRON_CORE)) {$rsys = '';}
if($rsys != '') {
$js .= $rsys;
}

2
jx/battle/refresh2.php
View File

@ -183,7 +183,7 @@
$i++;
}
$atk1 = 0;
if(!isset($CRON_CORE)) {$rsys = $u->sys_see(0);}
if(!isset($CRON_CORE)) {$rsys = '';}
if($rsys != '') {
$js .= $rsys;
}

2
jx/battle/refresh_bot.php
View File

@ -215,7 +215,7 @@ if (isset($CRON_CORE) && (isset($_POST['atack'], $_POST['block']) || (isset($_PO
$i++;
}
$atk1 = 0;
$rsys = $u->sys_see(0);
$rsys = '';
if ($rsys != '') {
$js .= $rsys;
}

2
jx/battle/refresh_vip.php
View File

@ -220,7 +220,7 @@ if ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' || isset($CRON_CORE))
}
$atk1 = 0;
if (!isset($CRON_CORE)) {
$rsys = $u->sys_see(0);
$rsys = '';
}
if ($rsys != '') {
$js .= $rsys;