master bin
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	_Out/Server/Debug/NFGameServer1/NFGameServerNet_ClientPlugin_d.dll
	_Out/Server/Debug/NFGameServer1/NFGameServerNet_ServerPlugin_d.dll
	_Out/Server/Debug/NFGameServer1/NFGameServerPlugin_d.dll
	_Out/Server/Debug/NFLoginServer/NFLoginNet_ClientPlugin_d.dll
	_Out/Server/Debug/NFLoginServer/NFLoginNet_ServerPlugin_d.dll
	_Out/Server/Debug/NFMasterServer/NFMasterNet_ServerPlugin_d.dll
	_Out/Server/Debug/NFProxyServer1/NFProxyServerNet_ClientPlugin_d.dll
	_Out/Server/Debug/NFProxyServer1/NFProxyServerNet_ServerPlugin_d.dll
	_Out/Server/Release/NFGameServer1/NFGameServerNet_ClientPlugin.dll
	_Out/Server/Release/NFGameServer1/NFGameServerNet_ServerPlugin.dll
	_Out/Server/Release/NFGameServer1/NFGameServerPlugin.dll
	_Out/Server/Release/NFLoginServer/NFLoginNet_ClientPlugin.dll
	_Out/Server/Release/NFLoginServer/NFLoginNet_ServerPlugin.dll
	_Out/Server/Release/NFMasterServer/NFMasterNet_ServerPlugin.dll
	_Out/Server/Release/NFProxyServer1/NFProxyServerNet_ClientPlugin.dll
	_Out/Server/Release/NFProxyServer1/NFProxyServerNet_ServerPlugin.dll
	_Out/Server/Release/NFWorldServer/NFWorldLogicPlugin.dll
	_Out/Server/Release/NFWorldServer/NFWorldNet_ClientPlugin.dll
	_Out/Server/Release/NFWorldServer/NFWorldNet_ServerPlugin.dll
modified interface of property and record