miduo_client/Assets/ManagedResources/~Lua/Modules/Harmony
jiaoyangna 4121f24a27 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2021-03-10 13:50:38 +08:00
..
EnvoyItem 【本地化】lua文本重新导出 2021-03-04 16:44:37 +08:00
Manager 【本地化】lua文本重新导出 2021-03-04 16:44:37 +08:00
Panel Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-03-10 13:50:38 +08:00
View 【本地化】lua文本重新导出 2021-03-04 16:44:37 +08:00
EnvoyItem.meta 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
HarmonyPanel.lua 【适配】鸿蒙阵屏幕适配修改 2021-03-07 16:19:53 +08:00
HarmonyPanel.lua.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
Manager.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
Panel.meta 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
View.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00