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

Объединение панелей склонностей.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-06-22 16:53:42 +03:00
parent 7270ec2004
commit 802f0a2ad0
8 changed files with 117 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
_incl_data/class/User.php
View File

@@ -4,6 +4,7 @@ use Core\Config;
use Core\ConversionHelper;
use Core\Database;
use Core\Db;
use Model\ActionModel;
use User\ItemsModel;
class User
@@ -2257,18 +2258,12 @@ class User
public function addAction($time, $vars, $vls, $uid = null): bool
{
if ($uid == null) {
$uid = $this->info['id'];
$info = $this->info;
if ($uid) {
$info['id'] = $uid;
}
$ins = mysql_query(
'INSERT INTO `actions` (`uid`,`time`,`city`,`room`,`vars`,`ip`,`vals`) VALUES ("' . $uid . '","' . $time . '","' . $this->info['city'] . '","' . $this->info['room'] . '","' . mysql_real_escape_string(
$vars
) . '","' . mysql_real_escape_string($_SERVER['HTTP_X_REAL_IP']) . '","' . mysql_real_escape_string(
$vls
) . '")'
);
return (bool)$ins;
ActionModel::new($info, $vls, $vars, $time);
return true;
}
public function testAction($filter, $tp)
@@ -6958,11 +6953,11 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
$pl['rep'] = 2;
}
}
$is1 .= '<a href="javascript:void(0);" onclick="takeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',' . $pl['rep'] . ');">Выбрать</a>';
$is1 .= '<a href="javascript:void(0);" onclick="takeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',' . $pl['rep'] . ')">Выбрать</a>';
} elseif ($type == 14) {
$is1 .= '<a href="javascript:void(0);" onclick="massTakeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',0);">Выбрать</a>';
$is1 .= '<a href="javascript:void(0);" onclick="massTakeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',0)">Выбрать</a>';
} elseif ($type == 12) {
$is1 .= '<a href="javascript:void(0);" onclick="takeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',1);">Выбрать</a>';
$is1 .= '<a href="javascript:void(0);" onclick="takeItRun(\'' . $pl['img'] . '\',' . $pl['id'] . ',1)">Выбрать</a>';
} elseif ($type == 10) {
//Общага (отображение предметов в общаге (под стеклом))
$is1 .= '<a href="javascript:void(0)" class="obj_take" data-code="' . $code . '" data-room="' . ((int)$_GET['room']) . '" rel="' . $pl['id'] . '">В рюкзак</a>';
@@ -7164,7 +7159,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
$inv1 = 'inv=1&';
}
if ($pl['item_id'] == 74) {
$is1 .= '<a onclick="top.addNewSmile(' . $pl['id'] . ',0); return false;" href="javascript:void(0)" title="Использовать">исп-ть</a>';
$is1 .= '<a onclick="top.addNewSmile(' . $pl['id'] . ',0) return false;" href="javascript:void(0)" title="Использовать">исп-ть</a>';
} else {
$useUrl = '';
if ($pl['magic_inc'] == '') {
@@ -7192,7 +7187,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
}
if ($pl['max_text'] > 0 && $pl['max_text'] - $pl['use_text'] > 0) {
$is1 .= '<a onclick="top.addNewText(' . $pl['id'] . ',' . ($pl['max_text'] - $pl['use_text']) . ',' . $pl['inRazdel'] . '); return false;" href="javascript:void(0)" title="Записать текст на предмете">Записать</a><br>';
$is1 .= '<a onclick="top.addNewText(' . $pl['id'] . ',' . ($pl['max_text'] - $pl['use_text']) . ',' . $pl['inRazdel'] . ') return false;" href="javascript:void(0)" title="Записать текст на предмете">Записать</a><br>';
}
if ($pl['type'] == 31 || $pl['type'] == 46 || $pl['type'] == 48 || $pl['type'] == 50 || $pl['type'] == 62 || $pl['type'] == 68 || $pl['type'] == 37 || $pl['type'] == 47) {
if ($d[2] == 1) {
@@ -8622,7 +8617,7 @@ LIMIT 1'
if ($i1 == 0 && $u['battle'] == 0) {
$rt[0] .= '<script>top.lafstReg[' . $u['id'] . '] = 0; top.startHpRegen("main",' . $u['id'] . ',' . (0 + $sn['hpNow']) . ',' . (0 + $sn['hpAll']) . ',' . (0 + $sn['mpNow']) . ',' . (0 + $sn['mpAll']) . ',' . (time(
) - $u['regHP']) . ',' . (time(
) - $u['regMP']) . ',' . (0 + $this->rgd[0]) . ',' . (0 + $this->rgd[1]) . ',1);</script>';
) - $u['regMP']) . ',' . (0 + $this->rgd[0]) . ',' . (0 + $this->rgd[1]) . ',1)</script>';
}
if ($ivv == 0 && $i1 == 0) {
$rt[0] .= $this->info_remont();