主界面邮件按钮无法点击问题
奖励界面修改
数据修改
Merge branch 'master' of 192.168.189.14:fant2_clientres
debug
数据更改
debug
Merge branch 'master' of 192.168.189.14:fant2_clientres
战斗背景
Merge branch 'master' of 192.168.189.14:fant2_clientres
扭蛋结果显示修改
数据修改
xui调整
数据修改
跳跃
Merge branch 'master' of 192.168.189.14:fant2_clientres
数据更新
Merge branch 'master' of 192.168.189.14:fant2_clientres

Conflicts:
	gameres/res/script/ui/ui_gacha_ing.lua
	gameres/res/script/ui/ui_gacha_result.lua
	gameres/res/ui/gacha_ing.xui
	gameres/res/ui/gacha_result.xui
Merge branch 'master' of 192.168.189.14:fant2_clientres
美术资源上传