横版改动
提交UI修改
添加橫版角色，去除攻擊特效
更新横版
替換資源
替换部分资源
修改资源
添加更改资源
主界面UI资源替换，世界地图背景替换
补资源
世界地图文件
Merge branch 'Heng'

Conflicts:
	gameres/res/ani/x.ani
	gameres/res/image/map/green_wild_1136x720.png
	gameres/res/image/pet/fly_dragon/atk.png
	gameres/res/image/pet/fly_dragon/hurt.png
	gameres/res/image/pet/fly_dragon/standby.png
Merge branch 'master' of 192.168.189.14:fant2_clientres

Conflicts:
	gameres/res/image/ui/x_battle_main_ui/skill1.png
	gameres/res/ui/x_battle_mainui.xui
	gameres/res/ui/x_battle_pvp.xui
删除废弃45°资源
重新上传新客户端