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

Merge

Browse Source
This commit is contained in:
Ivor Barhansky
2023-07-31 20:06:51 +03:00
parent cffcf57031 c4f0485960
commit 08b43f096e
109 changed files with 15204 additions and 33584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buttons.php
+25 -21
View File
@@ -5,6 +5,7 @@
use Core\Config;
use Core\Database;
use Core\Db;
use User\Clan;
use User\UserIp;
if (!defined('GAME_VERSION')) {
@@ -32,6 +33,9 @@ $u = User::start();
$filter = new Filter();
$chat = new Chat();
$userclan = new Clan($u->info);
ini_set('max_execution_time', '120');
if (isset($_GET['showcode'])) {
@@ -58,6 +62,15 @@ if ($u->info['online'] < time() - 60) {
$u->stats = $u->getStats($u->info['id'], 0);
if (!isset($_COOKIE['d1c'])) {
$detect = new MobileDetect;
$deviceType = $detect->isMobile() ? $detect->isTablet() ? 'tablet' : 'phone' : 'computer';
$_COOKIE['d1c'] = $deviceType;
setcookie('d1c', $deviceType, (time() + 86400));
} else {
$deviceType = $_COOKIE['d1c'];
}
?>
<!DOCTYPE html>
<html lang="ru-RU">
@@ -73,6 +86,8 @@ $u->stats = $u->getStats($u->info['id'], 0);
<script>
window.des = 1;
<?= $userclan->isRegistered() ? "const clanImage = '" . Images::getSrc($userclan->getLogo()) . "';" : 'let clanImage;' ?>
const c = {
noEr: 0,
noErTmr: 0,
@@ -89,7 +104,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
time: <?= time() ?>,
pl: 0,
align: <?= $u->info['align'] ?>,
clan: <?= $u->info['clan'] ?>,
clan: <?= $userclan->getId() ?>,
admin: <?= $u->info['admin'] ?>,
sound: 0,
money: <?= $u->info['money'] ?>
@@ -150,19 +165,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
<script type="text/javascript" src="js/trainingModals/registration/index.js"></script>
<?php
if (!isset($_COOKIE['d1c'])) {
$detect = new MobileDetect;
$deviceType = $detect->isMobile() ? $detect->isTablet() ? 'tablet' : 'phone' : 'computer';
$_COOKIE['d1c'] = $deviceType;
setcookie('d1c', $deviceType, (time() + 86400));
} else {
$deviceType = $_COOKIE['d1c'];
}
if ($deviceType == 'tablet' || $deviceType == 'phone'): ?>
<?php if ($deviceType == 'tablet' || $deviceType == 'phone'): ?>
<style>
#touchmain {
padding: 0;
@@ -195,6 +198,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
vertical-align: bottom;
}
/* Стили с динамически-генерируемым именем для telegraf.php */
#tgf_loadingLine {
height: 18px;
width: 100%;
@@ -271,6 +275,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
border-radius: 4px;
}
/* Стили с динамически-генерируемым именем для logs.php, btl_bac.php, location\btl_.php */
/* цвета команд */
.CSSteam0 {
font-weight: bold;
@@ -994,13 +999,12 @@ $u->stats = $u->getStats($u->info['id'], 0);
</td>
<?php
}
if ($u->info['clan'] > 0) { ?>
<td style="width: 30px">
<img onClick="top.getUrl('main','main.php?clan=1&rnd='+c.rnd);" class="db cp" title="Клан"
src="<?= Config::img() ?>/i/buttons/chatBtn14.gif" alt="Клан">
</td>
<?php
}
?>
<td style="width: 30px">
<img onClick="top.getUrl('main','main.php?clan=1&rnd='+c.rnd);" class="db cp" title="Клан"
src="<?= Config::img() ?>/i/buttons/chatBtn14.gif" alt="Клан">
</td>
<?php
if ($u->info['admin'] > 0) { ?>
<td style="width: 30px">
<img onClick="top.getUrl('main','main.php?admin=1&rnd='+c.rnd);" class="db cp"