# Conflicts: # Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab |
||
|---|---|---|
| .. | ||
| Resolve_Dismantle.lua | ||
| Resolve_Dismantle.lua.meta | ||
| Resolve_EquipTreasure.lua | ||
| Resolve_EquipTreasure.lua.meta | ||
| Resolve_Recall.lua | ||
| Resolve_Recall.lua.meta | ||
# Conflicts: # Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab |
||
|---|---|---|
| .. | ||
| Resolve_Dismantle.lua | ||
| Resolve_Dismantle.lua.meta | ||
| Resolve_EquipTreasure.lua | ||
| Resolve_EquipTreasure.lua.meta | ||
| Resolve_Recall.lua | ||
| Resolve_Recall.lua.meta | ||