# Conflicts: # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua |
||
|---|---|---|
| .. | ||
| ConfigData.lua | ||
| ConfigData.lua.meta | ||
| SoundData.lua | ||
| SoundData.lua.meta | ||
| UIData.lua | ||
| UIData.lua.meta | ||
# Conflicts: # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua |
||
|---|---|---|
| .. | ||
| ConfigData.lua | ||
| ConfigData.lua.meta | ||
| SoundData.lua | ||
| SoundData.lua.meta | ||
| UIData.lua | ||
| UIData.lua.meta | ||