Merge
This commit is contained in:
+35
-38
@@ -6,6 +6,8 @@ elem.parentNode.removeChild(elem);
|
||||
</script>";
|
||||
|
||||
use Core\Config;
|
||||
use Core\ConversionHelper;
|
||||
use DarksLight2\Battle\Techniques\TechniqueCategoryEntity;
|
||||
use DarksLight2\Training\TrainingManager;
|
||||
|
||||
if (!defined('GAME')) {
|
||||
@@ -199,7 +201,7 @@ $tma = '';
|
||||
<TD>
|
||||
<?php
|
||||
echo $u->microLogin($u->info['id']);
|
||||
$st = \Core\ConversionHelper::dataStringToArray($u->info['stats']);
|
||||
$st = ConversionHelper::dataStringToArray($u->info['stats']);
|
||||
if (
|
||||
$_GET['dec_transfer'] ||
|
||||
$_GET['dec_travma'] ||
|
||||
@@ -259,7 +261,7 @@ $tma = '';
|
||||
$st['os9'] += (int)$_GET['speed_HP'];
|
||||
$st['os10'] += (int)$_GET['speed_MP'];
|
||||
$st['os11'] += (int)$_GET['speed_debuff'];
|
||||
$u->info['stats'] = \Core\ConversionHelper::arrayToDataString($st);
|
||||
$u->info['stats'] = ConversionHelper::arrayToDataString($st);
|
||||
}
|
||||
if ($u->info['sskills'] - (int)$summs < 0) {
|
||||
echo ' <span style="color: red; ">У вас нет свободных особенностей</span><br>';
|
||||
@@ -464,7 +466,7 @@ $tma = '';
|
||||
$st['s10'] += (int)$_GET['god'];
|
||||
}
|
||||
|
||||
$u->info['stats'] = \Core\ConversionHelper::arrayToDataString($st);
|
||||
$u->info['stats'] = ConversionHelper::arrayToDataString($st);
|
||||
|
||||
if (
|
||||
$_GET['str'] < 0 ||
|
||||
@@ -504,12 +506,12 @@ $tma = '';
|
||||
)) {
|
||||
if ((int)$u->info['ability'] === 0 && (int)$u->info['skills'] === 0) {
|
||||
TrainingManager::getInstance()
|
||||
->addPoint(
|
||||
'my_user_third_quest',
|
||||
function (TrainingManager $manager) {
|
||||
$manager->store();
|
||||
}
|
||||
);
|
||||
->addPoint(
|
||||
'my_user_third_quest',
|
||||
function (TrainingManager $manager) {
|
||||
$manager->store();
|
||||
}
|
||||
);
|
||||
}
|
||||
function getSuccessStatusStat(string $name): string
|
||||
{
|
||||
@@ -817,17 +819,17 @@ $tma = '';
|
||||
font-weight: bold;
|
||||
}
|
||||
</STYLE>
|
||||
|
||||
<TABLE cellSpacing=0>
|
||||
<TR id="str" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()" onclick="OnClick(event,this);">
|
||||
<TR id="str" onMouseDown="ChangeSkill(event,this)" onMouseUp="DropTimer()"
|
||||
onclick="OnClick(event,this);">
|
||||
<TD>• Сила:</TD>
|
||||
<TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s1'] ?><BR></small></TD>
|
||||
<TD width=60 noWrap><?= $str ?></TD>
|
||||
<?php if ($u->info['ability'] > 0): ?>
|
||||
<TD>
|
||||
<IMG id="minus_str" src=<?= Config::img() ?>/i/minus.gif class="nonactive" ALT="уменьшить">
|
||||
<IMG id="plus_str" src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"></TD>
|
||||
<?php endif; ?>
|
||||
<TD width=60 noWrap><?= $dex ?></TD> <?php
|
||||
if ($u->info['ability'] > 0) { ?>
|
||||
<TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
|
||||
ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
|
||||
class=skill
|
||||
ALT="увеличить" id="plus_dex"></TD><?php } ?>
|
||||
</TR>
|
||||
<TR id="dex" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
|
||||
onclick="OnClick(event,this);">
|
||||
@@ -848,10 +850,10 @@ $tma = '';
|
||||
<TD width=60 noWrap><?= $inst ?></TD>
|
||||
<?php
|
||||
if ($u->info['ability'] > 0) { ?>
|
||||
<TD><IMG id="minus_inst" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
|
||||
<TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
|
||||
ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
|
||||
class=skill
|
||||
ALT="увеличить" id="plus_inst"></TD><?php } ?>
|
||||
ALT="увеличить" id="plus_dex"></TD><?php } ?>
|
||||
</TR>
|
||||
<TR id="power" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
|
||||
onclick="OnClick(event,this);">
|
||||
@@ -860,10 +862,10 @@ $tma = '';
|
||||
<TD width=60 noWrap></TD>
|
||||
<?php
|
||||
if ($u->info['ability'] > 0) { ?>
|
||||
<TD><IMG id="minus_power" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
|
||||
<TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
|
||||
ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
|
||||
class=skill
|
||||
ALT="увеличить" id="plus_power"></TD><?php } ?>
|
||||
ALT="увеличить" id="plus_dex"></TD><?php } ?>
|
||||
</TR>
|
||||
<?php
|
||||
if ($u->info['level'] > 3) { ?>
|
||||
@@ -963,7 +965,6 @@ $tma = '';
|
||||
<?php
|
||||
} ?>
|
||||
</TABLE>
|
||||
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE>
|
||||
@@ -1403,14 +1404,15 @@ $tma = '';
|
||||
<div style="display: flex; width: 100%">
|
||||
<fieldset style="width: 50%">
|
||||
<legend><b>Категории</b></legend>
|
||||
<div style="display: flex; flex-wrap: wrap; flex-direction: column; justify-content: center;">
|
||||
<div
|
||||
style="display: flex; flex-wrap: wrap; flex-direction: column; justify-content: center;">
|
||||
<?php
|
||||
// недописанный огрызок неизвестно чего
|
||||
$categories = TechniqueCategoryEntity::getInstance()->findAll();
|
||||
foreach ($categories as $category) {
|
||||
?>
|
||||
<div style='margin-right: 10px;height: 20px'>
|
||||
<a onclick='show_div("--><?php //= $category->id ?>//")' href='#'>
|
||||
<a onclick='show_div("<?= $category->id ?>")' href='#'>
|
||||
<?= $category->name ?>
|
||||
</a>
|
||||
</div>
|
||||
@@ -1446,7 +1448,7 @@ $tma = '';
|
||||
$clr = $clr == 'C7' ? 'D5' : 'C7';
|
||||
$v1 = '';
|
||||
$v2 = '';
|
||||
$v3 = \Core\ConversionHelper::dataStringToArray($u->stats['effects'][$i]['data']);
|
||||
$v3 = ConversionHelper::dataStringToArray($u->stats['effects'][$i]['data']);
|
||||
$j = 0;
|
||||
while ($j < count($u->items['add'])) {
|
||||
if (isset($v3['add_' . $u->items['add'][$j]])) {
|
||||
@@ -1505,7 +1507,7 @@ $tma = '';
|
||||
$clr = $clr == 'C7' ? 'D5' : 'C7';
|
||||
$v1 = '';
|
||||
$v2 = '';
|
||||
$v3 = \Core\ConversionHelper::dataStringToArray($e['bonus']);
|
||||
$v3 = ConversionHelper::dataStringToArray($e['bonus']);
|
||||
|
||||
$j = 0;
|
||||
while ($j < count($u->items['add'])) {
|
||||
@@ -1564,8 +1566,7 @@ $tma = '';
|
||||
$ae = '';
|
||||
|
||||
$sp = mysql_query(
|
||||
'SELECT * FROM `eff_users` WHERE `v1` LIKE "pgb%" AND `delete` = "0" AND `deactiveTime` > ' . time(
|
||||
) . ' AND `uid` = "' . $u->info['id'] . '" ORDER BY `timeUse` DESC'
|
||||
'SELECT * FROM `eff_users` WHERE `v1` LIKE "pgb%" AND `delete` = "0" AND `deactiveTime` > ' . time() . ' AND `uid` = "' . $u->info['id'] . '" ORDER BY `timeUse` DESC'
|
||||
);
|
||||
while ($pl = mysql_fetch_array($sp)) {
|
||||
$tp = (int)str_replace('pgb', '', $pl['v1']);
|
||||
@@ -1593,7 +1594,7 @@ $tma = '';
|
||||
<?php
|
||||
/* Бонусы статов */
|
||||
$b = [];
|
||||
//$st = [];
|
||||
$st = [];
|
||||
|
||||
//Бонусы статов
|
||||
//Бонусы статов
|
||||
@@ -1921,7 +1922,7 @@ $tma = '';
|
||||
//добавляем действия комплекта
|
||||
$cmss .= '<small style="color:grey">';
|
||||
$ij = 0;
|
||||
$sti = \Core\ConversionHelper::dataStringToArray($plc['data']);
|
||||
$sti = ConversionHelper::dataStringToArray($plc['data']);
|
||||
while ($ij < count($ia)) {
|
||||
if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) {
|
||||
$mad = $sti[$ia[$ij]];
|
||||
@@ -2020,7 +2021,7 @@ $tma = '';
|
||||
god: <?=$st['s10']?>
|
||||
<?php }?>
|
||||
};
|
||||
var skillsArr = new Array();
|
||||
var skillsArr = [];
|
||||
skillsArr["m_axe"] = <?=$st['a4']?>;
|
||||
skillsArr["m_molot"] = <?=$st['a3']?>;
|
||||
skillsArr["m_staff"] = <?=$st['a5']?>;
|
||||
@@ -2035,7 +2036,7 @@ $tma = '';
|
||||
skillsArr["m_magic7"] = <?=$st['mg7']?>;
|
||||
|
||||
function SetAllSkills(isOn) {
|
||||
var arrSkills = new Array("str", "dex", "inst", "power", "intel", "wis", "spirit", "will", "freedom", "god");
|
||||
var arrSkills = ["str", "dex", "inst", "power", "intel", "wis", "spirit", "will", "freedom", "god"];
|
||||
for (var i in arrSkills) {
|
||||
var clname = (isOn) ? "skill" : "nonactive";
|
||||
if (oNode = document.getElementById("plus_" + arrSkills[i])) oNode.className = clname;
|
||||
@@ -2258,7 +2259,7 @@ $tma = '';
|
||||
}
|
||||
?>
|
||||
<FIELDSET>
|
||||
<LEGEND style="font-weight: bold; color: #660000;">Текущее Ежедневное задание: </LEGEND>
|
||||
<LEGEND style="font-weight: bold; color: #660000;">Текущее Ежедневное задание:</LEGEND>
|
||||
<?= $daytext ?>
|
||||
<BR>
|
||||
</FIELDSET>
|
||||
@@ -2326,10 +2327,6 @@ $tma = '';
|
||||
• <B>Храм Знаний</B> - <?= $u->rep_zv(1, $u->rep['rep1']) ?><BR>
|
||||
<?php
|
||||
}
|
||||
if ($u->rep['rep2'] > 0) { ?>
|
||||
• <B>Алтарь Крови</B> - <?= $u->rep_zv(5, $u->rep['rep2']) ?><BR>
|
||||
<?php
|
||||
}
|
||||
if ($u->rep['repdreamscity'] > 0) { ?>
|
||||
• <B>Водосток</B> - <?= $u->rep_zv(9, $u->rep['repdreamscity']) ?><BR>
|
||||
<?php
|
||||
@@ -2346,7 +2343,7 @@ $tma = '';
|
||||
1
|
||||
);
|
||||
if (isset($sf['id'])) {
|
||||
$sfe = \Core\ConversionHelper::dataStringToArray($sf['vals']);
|
||||
$sfe = ConversionHelper::dataStringToArray($sf['vals']);
|
||||
$sf[0] = $u->info['exp'] - (int)$sfe['e'];
|
||||
$sf[1] = $u->info['win'] - (int)$sfe['w'];
|
||||
$sf[2] = $u->info['lose'] - (int)$sfe['l'];
|
||||
|
||||
Reference in New Issue
Block a user