# Conflicts: # Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua |
||
|---|---|---|
| .. | ||
| Manager | ||
| Framework.lua | ||
| Framework.lua.meta | ||
| GameDataBase.lua | ||
| GameDataBase.lua.meta | ||
| Manager.meta | ||
# Conflicts: # Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua |
||
|---|---|---|
| .. | ||
| Manager | ||
| Framework.lua | ||
| Framework.lua.meta | ||
| GameDataBase.lua | ||
| GameDataBase.lua.meta | ||
| Manager.meta | ||