_
This commit is contained in:
parent
be9f15581e
commit
d3a2ec0ef9
54
EditorUserSettings.asset
Normal file
54
EditorUserSettings.asset
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!162 &1
|
||||||
|
EditorUserSettings:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 4
|
||||||
|
m_ConfigSettings:
|
||||||
|
RecentlyUsedScenePath-0:
|
||||||
|
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-1:
|
||||||
|
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-2:
|
||||||
|
value: 22424703114646680e0b0227036c73150012147b623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-3:
|
||||||
|
value: 22424703114646680e0b0227036c731500121478623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-4:
|
||||||
|
value: 22424703114646680e0b0227036c731500121479623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-5:
|
||||||
|
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-6:
|
||||||
|
value: 22424703114646680e0b0227036c73150012147e623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-7:
|
||||||
|
value: 22424703114646680e0b0227036c73150012147c623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-8:
|
||||||
|
value: 22424703114646680e0b0227036c73150012147f623d28393930
|
||||||
|
flags: 0
|
||||||
|
UnityRemoteCompression:
|
||||||
|
value: 337f73
|
||||||
|
flags: 0
|
||||||
|
UnityRemoteDevice:
|
||||||
|
value: 225f4d46245b0d4902070862342649191512
|
||||||
|
flags: 0
|
||||||
|
vcSharedLogLevel:
|
||||||
|
value: 0d5e400f0650
|
||||||
|
flags: 0
|
||||||
|
m_VCAutomaticAdd: 1
|
||||||
|
m_VCDebugCom: 0
|
||||||
|
m_VCDebugCmd: 0
|
||||||
|
m_VCDebugOut: 0
|
||||||
|
m_SemanticMergeMode: 2
|
||||||
|
m_VCShowFailedCheckout: 1
|
||||||
|
m_VCOverwriteFailedCheckoutAssets: 1
|
||||||
|
m_VCProjectOverlayIcons: 1
|
||||||
|
m_VCHierarchyOverlayIcons: 1
|
||||||
|
m_VCOtherOverlayIcons: 1
|
||||||
|
m_VCAllowAsyncUpdate: 1
|
@ -27,10 +27,17 @@ EditorUserSettings:
|
|||||||
value: 22424703114646680e0b0227036c73150012147c623d28393930
|
value: 22424703114646680e0b0227036c73150012147c623d28393930
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-7:
|
RecentlyUsedScenePath-7:
|
||||||
|
<<<<<<< Updated upstream
|
||||||
value: 22424703114646680e0b0227036c73150012147b623d28393930
|
value: 22424703114646680e0b0227036c73150012147b623d28393930
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-8:
|
RecentlyUsedScenePath-8:
|
||||||
value: 22424703114646680e0b0227036c73150012147e623d28393930
|
value: 22424703114646680e0b0227036c73150012147e623d28393930
|
||||||
|
=======
|
||||||
|
value: 22424703114646680e0b0227036c73150012147c623d28393930
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-8:
|
||||||
|
value: 22424703114646680e0b0227036c73150012147f623d28393930
|
||||||
|
>>>>>>> Stashed changes
|
||||||
flags: 0
|
flags: 0
|
||||||
UnityRemoteCompression:
|
UnityRemoteCompression:
|
||||||
value: 337f73
|
value: 337f73
|
||||||
|
Loading…
Reference in New Issue
Block a user