Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua
commit
f7a10bb23b
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua