zhangshanxue 39fc099fe6 Merge branch 'china/dev' into china/xq ... # Conflicts: # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset		2021-09-03 16:01:20 +08:00
..
HeroData.lua	【ios】lua文件格式修改	2021-04-20 13:58:00 +08:00
HeroData.lua.meta	…
HeroManager.lua	Merge branch 'china/dev' into china/xq	2021-09-03 16:01:20 +08:00
HeroManager.lua.meta	…
HeroSkinManager.lua	Merge branch 'china/dev-c' into 0功能/silingshilian	2021-05-24 16:39:34 +08:00
HeroSkinManager.lua.meta	…