Merge remote-tracking branch 'origin/dev-battle-fighterclass' into dev-battle-fighterclass

This commit is contained in:
2024-12-17 12:10:31 +02:00
11 changed files with 2200 additions and 35 deletions
+4 -13
View File
@@ -1048,18 +1048,9 @@ $allprice = Battle::getType($allprice, $thisBattle['smert'] == 1);
</tr>
</table>
<div class="st1222" id="volna"></div>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="260">&nbsp;</td>
<td>
<div style="font-size:12px;" id="battle_logg" align="left"></div>
<div align="left">Полную версию лога боя смотрите <a
href="/logs.php?log=<?php
echo $u->info['battle']; ?>" target="blank_">здесь »»</a></div>
<br/></td>
<td width="260">&nbsp;</td>
</tr>
</table>
<div style="font-size:12px; margin: 0 260px; text-align: left;" id="battle_logg"></div>
<div style="margin: 0 260px; text-align: left;">Полную версию лога боя смотрите <a href="/logs.php?log=<?= $u->info['battle'] ?>" target="blank_">здесь »»</a></div>
<br>
</div>
<!-- <script type="text/javascript" src="js/chat-engine.js"></script> -->
@@ -1132,5 +1123,5 @@ $allprice = Battle::getType($allprice, $thisBattle['smert'] == 1);
<?php
$priem = new Priems();
$btl = new Battle();
include('jx/battle/refresh1.php'); ?>
include('jx/battle/refresh.php'); ?>
</div>