Merge branch 'beginning' into final

LICENSE

+MIT License
+
+Copyright (c) 2008-2023 NMFORCE GAMES
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

+# 常磐大逃杀（PHP Battle Royale）
+A PHP based game emulating the settings and gameplay of the original Battle Royale series, with a lot of original spin and an original story with tons of references to pop culture.

gamedata/cache/addnpc_1.php

@@ -1741,7 +1741,7 @@ $anpcinfo = array
 		0 => array
 			(
 			'name' => '迷之搬运工',
-			'icon' => 10,
+			'icon' => 127,
 			'wep' => '大喇叭',
 			'wepk' => 'WP',
 			'wepe' => 25,

include/global.func.php

@@ -532,7 +532,7 @@ function update_db_player_structure($type=0)
 	return $type ? $db_player_structure_types : $db_player_structure;
 }
 //返回一个只有数据库合法字段键名的pdata数组
-function player_format_with_db_structure($data){
+/* function player_format_with_db_structure($data){
 	$ndata=Array();
 	$db_player_structure = update_db_player_structure();
 	foreach ($db_player_structure as $key)
@@ -541,6 +541,16 @@ function player_format_with_db_structure($data){
 		$ndata[$key]=isset($data[$key]) ? $data[$key] : '';
 	}
 	return $ndata;
+} */
+function player_format_with_db_structure($data){
+    $ndata=Array();
+    $db_player_structure = update_db_player_structure();
+    foreach ($db_player_structure as $key)
+    {
+        if(is_array($data[$key])) $data[$key]=json_encode($data[$key]);
+        $ndata[$key]=$data[$key];
+    }
+    return $ndata;
 }
 //为显示在主界面、尸体发现界面、游戏帮助界面的道具名、道具类、道具属性添加额外描述
 //传入$n=道具名/类/属性；$t='m'(使用名称数组)/'k'(类别)/'sk'(属性)；$short=1(传入的$n为数组情况下才有效，缩写属性)；$class(如果传入的$n没有匹配的样式,则应用该样式)