miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit
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
..
BattleUnit.lua 【战斗】优化身外化身casting显示时间 2021-12-14 13:51:41 +08:00
BattleUnit.lua.meta
BuffCtrl.lua 【战斗】=======第五期神魂提交 2021-12-09 14:25:02 +08:00
BuffCtrl.lua.meta
BuffView.lua 【战斗】=======第五期神魂提交 2021-12-09 14:25:02 +08:00
BuffView.lua.meta
EnemyView.lua Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
EnemyView.lua.meta
FloatNode.lua 主角技能提交 2021-10-20 21:33:37 +08:00
FloatNode.lua.meta
MonsterView.lua 【战斗】优化身外化身casting显示时间 2021-12-14 13:51:41 +08:00
MonsterView.lua.meta
PlayerView.lua Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
PlayerView.lua.meta
RoleView.lua [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00
RoleView.lua.meta
SkillCaster.lua 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
SkillCaster.lua.meta
SkillEffectNode.lua 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
SkillEffectNode.lua.meta