Merge branch 'develop' into 'main'

# This .gitignore file should be placed at the root of your Unity project directory

#

# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore

#

/[Ll]ibrary/

/[Tt]emp/

/[Oo]bj/

/[Bb]uild/

/[Bb]uilds/

/[Ll]ogs/

/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.

# They also could contain extremely sensitive data

/[Mm]emoryCaptures/

# Recordings can get excessive in size

/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin

# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin

/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory

.vs/

# Gradle cache directory

.gradle/

# Autogenerated VS/MD/Consulo solution and project files

ExportedObj/

.consulo/

*.csproj

*.unityproj

*.sln

*.suo

*.tmp

*.user

*.userprefs

*.pidb

*.booproj

*.svd

*.pdb

*.mdb

*.opendb

*.VC.db

# Unity3D generated meta files

*.pidb.meta

*.pdb.meta

*.mdb.meta

# Unity3D generated file on crash reports

sysinfo.txt

# Builds

*.apk

*.aab

*.unitypackage

*.app

# Crashlytics generated file

crashlytics-build.properties

# Packed Addressables

/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets

/[Aa]ssets/[Ss]treamingAssets/aa.meta

/[Aa]ssets/[Ss]treamingAssets/aa/*

 No newline at end of file

{

  "version": "1.0",

  "components": [

    "Microsoft.VisualStudio.Workload.ManagedGame"

  ]

}

fileFormatVersion: 2

guid: 5d8884e5b43d30c44a0dd7f6d04e4930

PluginImporter:

  externalObjects: {}

  serializedVersion: 2

  iconMap: {}

  executionOrder: {}

  defineConstraints: []

  isPreloaded: 0

  isOverridable: 0

  isExplicitlyReferenced: 0

  validateReferences: 1

  platformData:

  - first:

      Any: 

    second:

      enabled: 1

      settings: {}

  - first:

      Editor: Editor

    second:

      enabled: 0

      settings:

        DefaultValueInitialized: true

  - first:

      Windows Store Apps: WindowsStoreApps

    second:

      enabled: 0

      settings:

        CPU: AnyCPU

  userData: 

  assetBundleName: 

  assetBundleVariant: