Merge Settings with main

3 年前 · 41cc566f
--- a/UOP1_Project/Assets/Prefabs/UI/Shared/Popup/Confirmation_Popup.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/Shared/Popup/Confirmation_Popup.prefab
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 297632142728442599, guid: 344bb0b18b7db4b4e8874973eb391ca1,
+        type: 3}
+      propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
+      value: GUID:457af5455987a4876acc4332c3a761e5
+      objectReference: {fileID: 0}
    - target: {fileID: 7373103914063609958, guid: 344bb0b18b7db4b4e8874973eb391ca1,
        type: 3}
      propertyPath: m_Navigation.m_Mode
        type: 3}
      propertyPath: _currentType
      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 297632142728442599, guid: 344bb0b18b7db4b4e8874973eb391ca1,
+        type: 3}
+      propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
+      value: GUID:457af5455987a4876acc4332c3a761e5
      objectReference: {fileID: 0}
    - target: {fileID: 7373103914063609958, guid: 344bb0b18b7db4b4e8874973eb391ca1,
        type: 3}
--- a/Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
+++ b/Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
--- a/Data/ProBuilderMeshCache/61ff26a35193421ca949920d7f31272e.asset
+++ b/Data/ProBuilderMeshCache/61ff26a35193421ca949920d7f31272e.asset
--- a/Data/ProBuilderMeshCache/62e84ee9f9e643f1a032b508500bfd5c.asset
+++ b/Data/ProBuilderMeshCache/62e84ee9f9e643f1a032b508500bfd5c.asset
--- a/Data/ProBuilderMeshCache/699b94c63b6645b99d8ba37316fcff93.asset
+++ b/Data/ProBuilderMeshCache/699b94c63b6645b99d8ba37316fcff93.asset
--- a/Data/ProBuilderMeshCache/6a0867b1a5ad4282a9b96ce8d42b451a.asset
+++ b/Data/ProBuilderMeshCache/6a0867b1a5ad4282a9b96ce8d42b451a.asset
--- a/Data/ProBuilderMeshCache/7d7b607d50204db8baf1377967c5834d.asset
+++ b/Data/ProBuilderMeshCache/7d7b607d50204db8baf1377967c5834d.asset
--- a/Data/ProBuilderMeshCache/b231a51f7f7c4d3d844fcd19f431c1aa.asset
+++ b/Data/ProBuilderMeshCache/b231a51f7f7c4d3d844fcd19f431c1aa.asset
--- a/Data/ProBuilderMeshCache/b3199c19fac9465fa8be5ad4ea3c719f.asset
+++ b/Data/ProBuilderMeshCache/b3199c19fac9465fa8be5ad4ea3c719f.asset
--- a/Data/ProBuilderMeshCache/c9f58dccb1cb486ca75f49f57fdc3e92.asset
+++ b/Data/ProBuilderMeshCache/c9f58dccb1cb486ca75f49f57fdc3e92.asset
--- a/Data/ProBuilderMeshCache/cff9f16b897f4cb98d0b4409f93996d6.asset
+++ b/Data/ProBuilderMeshCache/cff9f16b897f4cb98d0b4409f93996d6.asset
--- a/Data/ProBuilderMeshCache/dc440f98f27344038ca03d19508cd548.asset
+++ b/Data/ProBuilderMeshCache/dc440f98f27344038ca03d19508cd548.asset
--- a/Data/ProBuilderMeshCache/f63752304425437e881aa897ac1f90d4.asset
+++ b/Data/ProBuilderMeshCache/f63752304425437e881aa897ac1f90d4.asset
--- a/Data/ProBuilderMeshCache/ff781790d31f4ebe94553ef82955f6ad.asset
+++ b/Data/ProBuilderMeshCache/ff781790d31f4ebe94553ef82955f6ad.asset
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
--- a/UOP1_Project/Assets/Scripts/Systems/Settings/SettingsGraphicsComponent.cs
+++ b/UOP1_Project/Assets/Scripts/Systems/Settings/SettingsGraphicsComponent.cs

 	public void SaveSettings()
 	{
+
+		_savedResolutionIndex = _currentResolutionIndex;
+		_savedAntiAliasingIndex = _currentAntiAliasingIndex;
+		_savedShadowDistanceTier = _currentShadowDistanceTier;
+		_savedFullscreenState = _isFullscreen;
 		float shadowDistance = ShadowDistanceTierList[_currentShadowDistanceTier].Distance;
 		_save.Invoke(_currentResolutionIndex, _currentAntiAliasingIndex, shadowDistance, _isFullscreen);
 	}
--- a/UOP1_Project/Assets/Scripts/UI/UIManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIManager.cs

 		_pauseScreen.gameObject.SetActive(false);

-		_gameState.ResetToPreviousGameState();
-		if (_gameState.CurrentGameState == GameState.Gameplay || _gameState.CurrentGameState == GameState.Combat)
+		_gameStateManager.ResetToPreviousGameState();
+		if (_gameStateManager.CurrentGameState == GameState.Gameplay || _gameStateManager.CurrentGameState == GameState.Combat)
 			_inputReader.EnableGameplayInput();
 		_selectionHandler.Unselect();
 	}

 		}
 		_selectionHandler.Unselect();
-		_gameState.ResetToPreviousGameState();
-		if (_gameState.CurrentGameState == GameState.Gameplay || _gameState.CurrentGameState == GameState.Combat)
+		_gameStateManager.ResetToPreviousGameState();
+		if (_gameStateManager.CurrentGameState == GameState.Gameplay || _gameStateManager.CurrentGameState == GameState.Combat)
 			_inputReader.EnableGameplayInput();
 	}

--- a/UOP1_Project/ProjectSettings/QualitySettings.asset
+++ b/UOP1_Project/ProjectSettings/QualitySettings.asset
    skinWeights: 4
    textureQuality: 0
    anisotropicTextures: 1
-    antiAliasing: 0
+    antiAliasing: 2
    softParticles: 0
    softVegetation: 1
    realtimeReflectionProbes: 1
--- a/UOP1_Project/Assets/ProBuilder
+++ b/UOP1_Project/Assets/ProBuilder
+fileFormatVersion: 2
+guid: e970aed0e0abb8b4cab7deae6310b4f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset.meta
+++ b/Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset.meta
+fileFormatVersion: 2
+guid: a32e89ac6653203458b08de0468e684f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset.meta
+++ b/Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset.meta
+fileFormatVersion: 2
+guid: 90bb98ba17e7429439a437e0a7ba8cbd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset.meta
+++ b/Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset.meta
+fileFormatVersion: 2
+guid: fec5432a897e7a440876c508354a284d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset.meta
+++ b/Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset.meta
+fileFormatVersion: 2
+guid: 8207ee3031038934a9b29175bddc1635
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset.meta
+++ b/Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset.meta
+fileFormatVersion: 2
+guid: 354a48e2d365fce4d9007c9836083541
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset.meta
+++ b/Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset.meta
+fileFormatVersion: 2
+guid: 38fe42120fb5acd438c8695219b2987c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset.meta
+++ b/Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset.meta
+fileFormatVersion: 2
+guid: 9a18c1b28239f8542b4d838c4ab31edb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset.meta
+++ b/Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset.meta
+fileFormatVersion: 2
+guid: 34c132f3227a96a41a30f074e05e1480
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset.meta
+++ b/Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset.meta
+fileFormatVersion: 2
+guid: e068b8234ec777a44a2102d755c06416
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/61ff26a35193421ca949920d7f31272e.asset.meta
+++ b/Data/ProBuilderMeshCache/61ff26a35193421ca949920d7f31272e.asset.meta
+fileFormatVersion: 2
+guid: 615e399cce91f814cb2aff644a5f7ce7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/62e84ee9f9e643f1a032b508500bfd5c.asset.meta
+++ b/Data/ProBuilderMeshCache/62e84ee9f9e643f1a032b508500bfd5c.asset.meta
+fileFormatVersion: 2
+guid: 05788634507c3b44d82e4c0f3328cb49
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/699b94c63b6645b99d8ba37316fcff93.asset.meta
+++ b/Data/ProBuilderMeshCache/699b94c63b6645b99d8ba37316fcff93.asset.meta
+fileFormatVersion: 2
+guid: 02313dc34538feb4890d973bb0e871ac
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/6a0867b1a5ad4282a9b96ce8d42b451a.asset.meta
+++ b/Data/ProBuilderMeshCache/6a0867b1a5ad4282a9b96ce8d42b451a.asset.meta
+fileFormatVersion: 2
+guid: f2ab43357652a7240bc5f0de9e339d32
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/6a6ab855268048f090fb4a08880db14f.asset.meta
+++ b/Data/ProBuilderMeshCache/6a6ab855268048f090fb4a08880db14f.asset.meta
+fileFormatVersion: 2
+guid: 350b4f3cf192d944e849c7cfd076b3e4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/6e8f5162dafe4a83a3f169fc26b062a2.asset.meta
+++ b/Data/ProBuilderMeshCache/6e8f5162dafe4a83a3f169fc26b062a2.asset.meta
+fileFormatVersion: 2
+guid: 1c0fa8330cf6cfc47a2c3043c170d842
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/7745ea35700249c88587f4c5b92240bb.asset.meta
+++ b/Data/ProBuilderMeshCache/7745ea35700249c88587f4c5b92240bb.asset.meta
+fileFormatVersion: 2
+guid: 52bb3ff852f97624ab8e1780a68414dd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/7d7b607d50204db8baf1377967c5834d.asset.meta
+++ b/Data/ProBuilderMeshCache/7d7b607d50204db8baf1377967c5834d.asset.meta
+fileFormatVersion: 2
+guid: b187aff2a437a3641964bee152c18c66
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/87545eadd98a49289cade05b8cfacfd8.asset.meta
+++ b/Data/ProBuilderMeshCache/87545eadd98a49289cade05b8cfacfd8.asset.meta
+fileFormatVersion: 2
+guid: bef0fb5e7d022e64f9c7dbfc895aa767
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/8c6c4747caf04faa9713d5d588f21f4c.asset.meta
+++ b/Data/ProBuilderMeshCache/8c6c4747caf04faa9713d5d588f21f4c.asset.meta
+fileFormatVersion: 2
+guid: 79a1f70dac3886d489f4e961babff152
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/8e7ba89d029d480182ebbbaf7d226876.asset.meta
+++ b/Data/ProBuilderMeshCache/8e7ba89d029d480182ebbbaf7d226876.asset.meta
+fileFormatVersion: 2
+guid: 76031a6f160a2534fa6955295439cc15
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/9a2333a5072248ea8967890cf9726479.asset.meta
+++ b/Data/ProBuilderMeshCache/9a2333a5072248ea8967890cf9726479.asset.meta
+fileFormatVersion: 2
+guid: ca012d5ee5856b44da92d638d17d273a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/9ce1bc46d9f34fda98c2c241090751e6.asset.meta
+++ b/Data/ProBuilderMeshCache/9ce1bc46d9f34fda98c2c241090751e6.asset.meta
+fileFormatVersion: 2
+guid: d3eff74f0e7b2594fa35c5f7f584d3ee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/9e5bde8421c440c7a9a7cd4182430eff.asset.meta
+++ b/Data/ProBuilderMeshCache/9e5bde8421c440c7a9a7cd4182430eff.asset.meta
+fileFormatVersion: 2
+guid: 203c8287f14fbaf40bb8f44f0276f1b2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/a6633cdf656d43c982a5f0dd1f78e2d6.asset.meta
+++ b/Data/ProBuilderMeshCache/a6633cdf656d43c982a5f0dd1f78e2d6.asset.meta
+fileFormatVersion: 2
+guid: a35bf748706fad04db85f2d76622e2cc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/b231a51f7f7c4d3d844fcd19f431c1aa.asset.meta
+++ b/Data/ProBuilderMeshCache/b231a51f7f7c4d3d844fcd19f431c1aa.asset.meta
+fileFormatVersion: 2
+guid: 1ee2175a4f6441a4cbedb767a2d831c3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/b3199c19fac9465fa8be5ad4ea3c719f.asset.meta
+++ b/Data/ProBuilderMeshCache/b3199c19fac9465fa8be5ad4ea3c719f.asset.meta
+fileFormatVersion: 2
+guid: 3379c8d4e18f4f84aae23d4796a85dff
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/b34a2c376d2c45e7a78cc6eaaa9acc21.asset.meta
+++ b/Data/ProBuilderMeshCache/b34a2c376d2c45e7a78cc6eaaa9acc21.asset.meta
+fileFormatVersion: 2
+guid: 1ec56314999b25b4285e66b240c71844
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/b3b353461fc74042866f6ff646a27efd.asset.meta
+++ b/Data/ProBuilderMeshCache/b3b353461fc74042866f6ff646a27efd.asset.meta
+fileFormatVersion: 2
+guid: f7a341ad40414064aa677f50362f0e4a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/bc1e40999cd3457484d0b75f946ff0d3.asset.meta
+++ b/Data/ProBuilderMeshCache/bc1e40999cd3457484d0b75f946ff0d3.asset.meta
+fileFormatVersion: 2
+guid: f836babc042eaf7468e3b888dcb2d452
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/c61c3c9b2db444e59e6fa1116ddaa4ea.asset.meta
+++ b/Data/ProBuilderMeshCache/c61c3c9b2db444e59e6fa1116ddaa4ea.asset.meta
+fileFormatVersion: 2
+guid: 15107d8ceb47d3e4a9abc21423874121
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/c8da1f21eddd463c8a72faaca82f8682.asset.meta
+++ b/Data/ProBuilderMeshCache/c8da1f21eddd463c8a72faaca82f8682.asset.meta
+fileFormatVersion: 2
+guid: caf99a57baba36e4295a958deff5fac7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/c9f58dccb1cb486ca75f49f57fdc3e92.asset.meta
+++ b/Data/ProBuilderMeshCache/c9f58dccb1cb486ca75f49f57fdc3e92.asset.meta
+fileFormatVersion: 2
+guid: f57894839e09bf542a1d4e8018ec14ad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/cba032fc7a774819b1acd64cd4b4a05c.asset.meta
+++ b/Data/ProBuilderMeshCache/cba032fc7a774819b1acd64cd4b4a05c.asset.meta
+fileFormatVersion: 2
+guid: 4fd377cf661a49e44bfe0123bbbfe088
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/cd18d1128bbb4721ad97d02290ff913e.asset.meta
+++ b/Data/ProBuilderMeshCache/cd18d1128bbb4721ad97d02290ff913e.asset.meta
+fileFormatVersion: 2
+guid: be986ca7ab9c9b544ab3e5f31f484309
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/cff9f16b897f4cb98d0b4409f93996d6.asset.meta
+++ b/Data/ProBuilderMeshCache/cff9f16b897f4cb98d0b4409f93996d6.asset.meta
+fileFormatVersion: 2
+guid: 917a8d9023661d846ad7e396abf70db9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/dbfdfff642fa4240ad4054c490c63c63.asset.meta
+++ b/Data/ProBuilderMeshCache/dbfdfff642fa4240ad4054c490c63c63.asset.meta
+fileFormatVersion: 2
+guid: 6671a6cfe02f48e49941f51f834eb6f0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/dc440f98f27344038ca03d19508cd548.asset.meta
+++ b/Data/ProBuilderMeshCache/dc440f98f27344038ca03d19508cd548.asset.meta
+fileFormatVersion: 2
+guid: 1513d6b5a07b9a24a9b08211e2163ae8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/efa938ae8064476a8a8f59aed80178ca.asset.meta
+++ b/Data/ProBuilderMeshCache/efa938ae8064476a8a8f59aed80178ca.asset.meta
+fileFormatVersion: 2
+guid: 345d0ecc137ce5f448efdda318d77dbc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/f41f2b49ad6b4d0aa42a9ef2fb364d18.asset.meta
+++ b/Data/ProBuilderMeshCache/f41f2b49ad6b4d0aa42a9ef2fb364d18.asset.meta
+fileFormatVersion: 2
+guid: 961b0d5079f01fd4392b36553ad727e2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/f63752304425437e881aa897ac1f90d4.asset.meta
+++ b/Data/ProBuilderMeshCache/f63752304425437e881aa897ac1f90d4.asset.meta
+fileFormatVersion: 2
+guid: fb40d92a13a6e1e46b4aa228ab2047f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/f7c84a6b59a34c47868896e3746c8afd.asset.meta
+++ b/Data/ProBuilderMeshCache/f7c84a6b59a34c47868896e3746c8afd.asset.meta
+fileFormatVersion: 2
+guid: aba222466785fc144b93aa2275f5b2af
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/fa30b31737ed49939edfb9c8dd091677.asset.meta
+++ b/Data/ProBuilderMeshCache/fa30b31737ed49939edfb9c8dd091677.asset.meta
+fileFormatVersion: 2
+guid: 3efcded560d40e649a12e42fcf84141f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/fa797cb5db7f42b3b3c58578354c2822.asset.meta
+++ b/Data/ProBuilderMeshCache/fa797cb5db7f42b3b3c58578354c2822.asset.meta
+fileFormatVersion: 2
+guid: f5475dcc83a44d647b43163c48d1951b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Data/ProBuilderMeshCache/ff781790d31f4ebe94553ef82955f6ad.asset.meta
+++ b/Data/ProBuilderMeshCache/ff781790d31f4ebe94553ef82955f6ad.asset.meta
+fileFormatVersion: 2
+guid: e335dcb7eb1f830488920ae085091aed
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: