hemp/ProjectZ
2
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Some shit

Browse Source
This commit is contained in:
Nikita Kruglickiy 2024-02-19 21:39:10 +03:00
parent 6a1f3590a3
commit 1962f73ac2
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab
View File

Binary file not shown.

11
Assets/SmartMergeRegistrator.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0bae4947f6aedab4e920f0a6b94cf17a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
ProjectSettings/RiderScriptEditorPersistedState.asset
View File

@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 0} m_Script: {fileID: 0}
m_Name: m_Name:
m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
lastWriteTicks: -8584934212363266927 lastWriteTicks: -8584932391242735107