Skip to content

Commit b40ad32

Browse files
uChemauChema
committed
Merge Settings with main
1 parent 01e2436 commit b40ad32

File tree

63 files changed

+1315
-590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1315
-590
lines changed

‎UOP1_Project/Assets/Prefabs/UI/Shared/Popup/Confirmation_Popup.prefab

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,11 @@ PrefabInstance:
914914
propertyPath: m_LocalEulerAnglesHint.z
915915
value: 0
916916
objectReference: {fileID: 0}
917+
- target: {fileID: 297632142728442599, guid: 344bb0b18b7db4b4e8874973eb391ca1,
918+
type: 3}
919+
propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
920+
value: GUID:457af5455987a4876acc4332c3a761e5
921+
objectReference: {fileID: 0}
917922
- target: {fileID: 7373103914063609958, guid: 344bb0b18b7db4b4e8874973eb391ca1,
918923
type: 3}
919924
propertyPath: m_Navigation.m_Mode
@@ -1098,6 +1103,11 @@ PrefabInstance:
10981103
propertyPath: _currentType
10991104
value: 1
11001105
objectReference: {fileID: 0}
1106+
- target: {fileID: 297632142728442599, guid: 344bb0b18b7db4b4e8874973eb391ca1,
1107+
type: 3}
1108+
propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
1109+
value: GUID:457af5455987a4876acc4332c3a761e5
1110+
objectReference: {fileID: 0}
11011111
- target: {fileID: 7373103914063609958, guid: 344bb0b18b7db4b4e8874973eb391ca1,
11021112
type: 3}
11031113
propertyPath: m_Navigation.m_Mode

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)