Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts: # Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefabdev_chengFeng
commit
5039a17349
# Conflicts: # Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefabdev_chengFeng