整理服务器端
整理服务器端
第一次运行
服务器端 哈哈哈
修改运行参数
合并主干
Merge branch 'master' into branch

Conflicts:
	client/.DS_Store
	client/LiZhuan.xcodeproj/project.xcworkspace/xcuserdata/sngyai.xcuserdatad/UserInterfaceState.xcuserstate
	server/.idea/.name
	server/.idea/misc.xml
	server/.idea/modules.xml
	server/.idea/vcs.xml
	server/.idea/workspace.xml
	server/ebin/erl_crash.dump
	server/ebin/server.app
	server/ebin/server.cmd
	server/ebin/server.cmd.bak
	server/include/common.hrl
	server/include/record.hrl
	server/priv/src/record_proplist/record_info.hrl
	server/priv/src/record_proplist/test.erl
	server/project.iml
	server/server.iml
	server/sngyai_server.iml
	server/src/db/db_agent_user.erl
	server/src/lib/lib_user.erl
	server/src/lib/storage_file/lib_storage_file_player.erl
	server/src/lib/utils/lib_util_type.erl
	server/src/main.erl
	server/src/mod/gen_player/mod_player.erl
	server/src/mod/mod_init.erl
	server/src/networking/tcp_request_broker.erl
	server/start-dev.sh
忽略
嵌入多盟
添加米迪回调
米迪获得积分处理
Merge remote-tracking branch 'origin/branch' into branch
添加任务记录——miidi
Merge remote-tracking branch 'origin/branch' into branch
服务器-测是对接客户端
客户端-测试与服务器对接
Merge remote-tracking branch 'origin/branch' into branch
将用户主ID改为varchar型
Merge remote-tracking branch 'origin/branch' into branch
服务器与客户多对接-获取用户积分