diff --git a/.P4Ignore b/.P4Ignore new file mode 100644 index 00000000..0d93a44a --- /dev/null +++ b/.P4Ignore @@ -0,0 +1,40 @@ +Library +Temp +Obj +Build +Builds +Logs +UserSettings +MemoryCaptures +Assets/AssetStoreTools* +Assets/Plugins/Editor/JetBrains* +.vs +.gradle +.idea +ExportedObj +.consulo +*.csproj +*.unityproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb +*.mdb +*.opendb +*.VC.db +*.pidb.meta +*.pdb.meta +*.mdb.meta +sysinfo.txt +*.apk +*.aab +*.unitypackage +crashlytics-build.properties +Assets/AddressableAssetsData/*/*.bin* +Assets/StreamingAssets/aa.meta +Assets/StreamingAssets/aa/* \ No newline at end of file diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset index dca28814..afcad6c2 100644 --- a/ProjectSettings/VersionControlSettings.asset +++ b/ProjectSettings/VersionControlSettings.asset @@ -3,6 +3,6 @@ --- !u!890905787 &1 VersionControlSettings: m_ObjectHideFlags: 0 - m_Mode: Visible Meta Files + m_Mode: Perforce m_CollabEditorSettings: inProgressEnabled: 1