miduo_client/Assets/ManagedResources/~Lua/Modules/WorldArena
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
..
WorldArenaBattleInfoPanel.lua Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
WorldArenaBattleInfoPanel.lua.meta 玉虚论道提交 2021-09-07 17:05:46 +08:00
WorldArenaMainPanel.lua 【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题 2021-11-02 14:43:47 +08:00
WorldArenaMainPanel.lua.meta 【玉虚论道】我的编队界面提交 2021-08-25 20:31:21 +08:00
WorldArenaManager.lua 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
WorldArenaManager.lua.meta 玉虚论道脚本预设提交 2021-08-31 15:10:27 +08:00
WorldArenaMyTeamPanel.lua [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
WorldArenaMyTeamPanel.lua.meta 【玉虚论道】我的编队界面提交 2021-08-25 20:31:21 +08:00
WorldArenaOtherTeamPanel.lua Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
WorldArenaOtherTeamPanel.lua.meta 【玉虚论道】其他人编队信息界面 2021-08-26 17:14:13 +08:00
WorldArenaRankRewardPanel.lua 玉虚修改 2021-10-13 19:35:30 +08:00
WorldArenaRankRewardPanel.lua.meta 【玉虚轮道】=====功能入口提交 2021-08-30 15:41:14 +08:00
WorldArenaRecordPopup.lua 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +08:00
WorldArenaRecordPopup.lua.meta 玉虚论道提交 2021-09-07 17:05:46 +08:00
WorldArenaUpRewardPanel.lua [玉虚论道]======玉虚段位奖励界面特效层级修改提交 2021-10-25 17:19:01 +08:00
WorldArenaUpRewardPanel.lua.meta 玉虚论道脚本预设提交 2021-08-31 15:10:27 +08:00