同步
同步
Merge branch 'master' of 192.168.189.14:fant2_clientres

Conflicts:
	LuaDebug/ClientLancher.pdb
	gameres/res/script/card_box/card_intensify.lua
卡牌背包
Merge branch 'master' of 192.168.189.14:fant2_clientres
剧情npc人物资源
背包
Merge branch 'master' of 192.168.189.14:fant2_clientres
debug
npc剧情配置
123
增加体力、精力恢复客户端显示
更新card数据
[卡牌强化 素材卡选择]
【扭蛋】扭蛋结果显示具体卡牌图片
Merge branch 'master' of 192.168.189.14:fant2_clientres

Conflicts:
	gameres/res.cn/config/strres.ini
	gameres/res/script/card_box/card_intensify.lua
文本引号修改
修改邮件显示
提交服务器
Merge branch 'master' of 192.168.189.14:fant2_clientres