Merge remote-tracking branch 'origin/main'

This commit is contained in:
Oscar 2024-03-16 21:11:49 +03:00
commit 80147fb28e
2 changed files with 3 additions and 16 deletions

4
.gitignore vendored
View File

@ -69,4 +69,6 @@ crashlytics-build.properties
# Temporary auto-generated Android Assets # Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/* /[Aa]ssets/[Ss]treamingAssets/aa/*
ProjectSettings/RiderScriptEditorPersistedState.asset

View File

@ -1,15 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Name:
m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
lastWriteTicks: -8584910005848256330