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

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

Browse Source
This commit is contained in:
Ivor Barhansky
2024-12-17 12:10:31 +02:00
parent d41147da45 7692c9f658
commit 09655ce234
11 changed files with 2200 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_incl_data/class/Battle.php
+15 -1
View File
@@ -1525,6 +1525,11 @@ JS;
$jstext = json_encode($log['text']);
$jsvars = json_encode($log['vars']);
//old
//$js = "add_log({$log['id']},0,$jstext,{$log['id_hod']},0,0,$jsvars)" . $js;
//home
//$js = "add_log({$log['id']},0,$jstext,{$log['id_hod']},$jsvars);" . $js;
//work
$js = "add_log({$log['id']},$jstext,{$log['id_hod']},$jsvars);" . $js;
}
@@ -1590,13 +1595,22 @@ JS;
$jstext = json_encode($log['text']);
$jsvars = json_encode($log['vars']);
$js = "add_mlog({$log['id']},0,$jstext,{$log['id_hod']},0,0,$jsvars)" . $js;
//old
//$js = "add_mlog({$log['id']},0,$jstext,{$log['id_hod']},0,0,$jsvars)" . $js;
//home
////$js = "add_mlog({$log['id']},0,$jstext,{$log['id_hod']},$jsvars);" . $js;
//$js = "add_mlog({$log['id']},0,'{$log['text']}',{$log['id_hod']},'{$log['vars']}');" . $js;
//work
$js = "add_mlog({$log['id']},$jstext,{$log['id_hod']},$jsvars)" . $js;
}
Db::sql('update stats set mlog = ? where id = ?', [$u->info['mlog'], $u->info['id']]);
$js .= "id_mlog=$pll;";
return htmlspecialchars($js, ENT_QUOTES);
//return htmlspecialchars($js, ENT_QUOTES);
return $js;
}
//Считаем урон