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

rename dir

Browse Source
This commit is contained in:
Ivor Barhansky
2023-08-11 18:28:54 +03:00
parent e359eb6f40
commit e5c7ff4a33
93 changed files with 86 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
_incl_data/class/User.php
View File

@@ -2765,8 +2765,8 @@ class User
if ($upd) {
$po = ConversionHelper::dataStringToArray($e['data']);
if (isset($po['finish_file'])) {
if (file_exists('_incl_data/class/magic/' . $po['finish_file'] . '.php')) {
require('_incl_data/class/magic/' . $po['finish_file'] . '.php');
if (file_exists('_incl_data/class/Magic/' . $po['finish_file'] . '.php')) {
require('_incl_data/class/Magic/' . $po['finish_file'] . '.php');
} else {
$this->error2 = '!File not exists "cgi-bin/magic.pl?use_' . $po['finish_file'] . '".';
}
@@ -4641,7 +4641,6 @@ class User
* @param $nosudba
* @param $plavka
* @return int|mixed|string
* @deprecated use ItemsModel::addItem()
*/
public function addItem($id, $uid, $md = null, $dn = null, $mxiznos = null, $nosudba = null, $plavka = null)
{
@@ -4658,6 +4657,7 @@ class User
* @param $nosudba
* @param $plavka
* @return int|mixed|string
* @deprecated use ItemsModel::addItem()
*/
public function addItem($id, $uid, $md = null, $dn = null, $mxiznos = null, $nosudba = null, $plavka = null)
{
@@ -7464,7 +7464,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
return $r;
}
public function shopSaleM($val, $itm): float
private function shopSaleM($val, $itm): float
{
$procs = [
0, //0
@@ -7509,7 +7509,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
return round(($val / 100 * (100 - $proc)), 2);
}
private function shopSaleM($val, $itm): float
public function shopSaleM($val, $itm): float
{
$procs = [
0, //0
@@ -9080,8 +9080,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
'UPDATE `items_users` SET `lastUPD` = "' . time() . '",`inGroup` = "0", `delete` = "0" WHERE `id` = "' . $itm['id'] . '" LIMIT 1'
);
}
if (file_exists('_incl_data/class/magic/' . $tr['items_in_file'] . '.php')) {
require('_incl_data/class/magic/' . $tr['items_in_file'] . '.php');
if (file_exists('_incl_data/class/Magic/' . $tr['items_in_file'] . '.php')) {
require('_incl_data/class/Magic/' . $tr['items_in_file'] . '.php');
if (!isset($no_open_itm)) {
$this->deleteItem($itm['id'], $this->info['id']);
$this->error = 'Вы успешно открыли &quot;' . $itm['name'] . '&quot;:<br>' . $io . '...';
@@ -9930,6 +9930,11 @@ LIMIT 1'
//получаем уровень
public function addEkr($amount)
{
Db::sql('update users set money2 = money2 + ? where id = ?', [$amount, $this->info['id']]);
}
public function addEkr($amount, $uid = 0)
{
if ($uid === 0) {
@@ -9938,11 +9943,6 @@ LIMIT 1'
Db::sql('update users set money2 = money2 + ? where id = ?', [$amount, $uid]);
}
public function addEkr($amount)
{
Db::sql('update users set money2 = money2 + ? where id = ?', [$amount, $this->info['id']]);
}
public function r2($v): string
{
return number_format($v, 2, '.', ' ');