Update Unity editor

This commit is contained in:
Christer Warén 2022-11-06 12:48:21 +02:00
parent 1c2c998484
commit d5cee89e6c
14 changed files with 1419 additions and 33 deletions

View File

@ -51,5 +51,4 @@ ScriptedImporter:
width: 0
height: 0
spriteID: 4ef636e0242240147bd55b7bb397a2c8
internalID: 0
PhysicsOutlines: []

View File

@ -60,7 +60,7 @@ TextureImporter:
213: -7871063343721398915
second: winner_18
externalObjects: {}
serializedVersion: 10
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -80,6 +80,8 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@ -88,9 +90,9 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
@ -111,9 +113,14 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -139,6 +146,30 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
@ -551,6 +582,26 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
winner_6: -3935168454881179083
winner_0: 2650913928579206598
winner_16: 7451123159460138711
winner_10: -574881834236260684
winner_12: -8691096800339340236
winner_15: 3804052056167345674
winner_3: 2911583734533505880
winner_18: -7871063343721398915
winner_2: 7387550310862708456
winner_1: 2623842405590999597
winner_14: -7861053222794058089
winner_17: -821007146911718494
winner_9: 3182408793868207164
winner_7: -4720431110883497293
winner_13: -3522028214164192282
winner_11: 8588556642569906399
winner_5: 5427284065603311641
winner_4: -6501218078955597983
winner_8: 2247428538626774566
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

View File

@ -6,7 +6,7 @@ TextureImporter:
213: -1093728420042376791
second: grasstest_lowres_0
externalObjects: {}
serializedVersion: 10
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -26,6 +26,8 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@ -35,8 +37,8 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
@ -57,9 +59,14 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -85,6 +92,30 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
@ -119,6 +150,8 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
grasstest_lowres_0: -1093728420042376791
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

View File

@ -663,7 +663,7 @@ TextureImporter:
213: 3727152739151723913
second: hardland10
externalObjects: {}
serializedVersion: 10
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -683,6 +683,8 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@ -692,8 +694,8 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
@ -714,9 +716,14 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -742,6 +749,30 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
@ -3065,6 +3096,117 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
run9: -2225337753171017087
idle21: -829856859153242411
jump_charge15: -3973982837760901240
run12: -1137678363302400272
jump_charge1: -6367302061358365307
idle8: 4859834048017358284
hardland14: -1792985804710985218
run3: -3392511561211885790
jump11: -7672021685992198234
jump_charge10: 4407125077710707988
jump7: -1407199840919242200
idle16: 7348978813017258394
idle1: -4875754636465202623
hardland15: -3710917035371835573
run8: 2934849124142698985
idle2: -7107172906470301330
run2: -2054716808199259710
hardland7: 415921098020737422
hardland6: -4743209633414359706
idle22: 5913277333827820792
run14: -1526598060093753372
hardland20: 428165586383024837
jump14: -4878402894775169803
jump_charge13: -8232038542299713647
jump_charge7: 5217668359800558158
idle18: -2064041543455461251
jump_charge12: -3893362472689462543
hardland1: 558651059181249777
run13: -8846401487119650628
jump_charge19: 7194465700557460690
jump16: 1574359967633516202
run5: 5046622260925856720
jump9: -7781682432611105077
jump_charge21: 7134126449708230338
idle6: -4484448115341458377
jump_charge3: -1631952831868314716
jump18: 4448488550856721054
hardland16: -388841668569274318
run7: -6036548002309615993
idle17: -4676275310385517549
hardland4: -1558465697978039222
jump_charge14: -1680468944484096594
jump4: -4059033993527320608
hardland13: -3209586721547761095
jump15: -2548964897146982169
jump_charge4: -4051713167622314649
run15: 3955347940717355426
jump13: -8639743321695154865
idle5: -2188984844611398186
jump22: -8705666895315548564
run1: -3109758266467645285
jump2: -2775254642341723503
jump12: 4132615580504735951
jump_charge2: -7556544632167003343
jump20: 1651610239694871467
hardland5: -6309514953070603395
idle7: 1570521896024466347
run19: 3398569441960942229
hardland9: 1359592818341714732
jump_charge8: -1484627546038221783
jump6: -1560452398328697000
jump_charge17: -2139008561802705604
hardland2: -7486664940351975867
hardland23: 1929842348252054108
jump1: -4572157266075969192
jump_charge18: 5024696974588001931
run16: 4787364794835522696
jump_charge20: 4745311664045314507
idle19: 8562130097325780516
jump21: -582308938874150289
idle10: -6054541065124143453
hardland3: 2218490972588531531
hardland18: 5887618345117774486
run11: 3972995285232232498
jump5: -7245956838964734647
hardland21: 864734797291782974
jump_charge16: -4104577327544255586
idle14: -219769378567701286
run18: -2277895527778550479
run21: -7960218240252198378
hardland12: 5444642648116586602
jump_charge9: -3414012039371936416
idle13: -5617828149325279669
jump_charge11: -2423323015706663206
run10: 2499456626172324289
jump8: -3823661213031510900
idle12: -1909313060810557305
hardland19: -9079233136405067815
run20: 6871935309468334205
jump_charge6: 1881782463716287476
run4: 4128941624623785079
idle9: -8608921344580492913
hardland17: -7721685838687906692
jump10: 5047393574061227655
idle20: -2331531718734322513
run17: 1730682210532443027
jump19: -6027763740008814114
idle3: 6103586979942586457
hardland10: 3727152739151723913
idle4: -2882593077361657767
jump_charge5: 4622662407762375271
run6: 3055445036958817877
idle11: -4219017684672185812
hardland11: -9197051372706716169
run22: 6635307992007921965
hardland8: -8137449569375297382
jump3: 1096309612742741767
idle15: 1752407436320682438
hardland22: 3375836076841311827
jump17: 6895035077966590871
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

View File

@ -1,16 +1,16 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "3.0.18",
"com.unity.2d.spriteshape": "7.0.6",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.collab-proxy": "1.14.15",
"com.unity.collab-proxy": "1.17.2",
"com.unity.ext.nunit": "1.0.6",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "2.1.4",
"com.unity.timeline": "1.2.18",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.12",
"com.unity.modules.ai": "1.0.0",

View File

@ -1,17 +1,19 @@
{
"dependencies": {
"com.unity.2d.common": {
"version": "2.1.0",
"version": "6.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.burst": "1.5.1"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.path": {
"version": "2.1.1",
"version": "5.0.2",
"depth": 1,
"source": "registry",
"dependencies": {},
@ -24,13 +26,14 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "3.0.18",
"version": "7.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "2.1.0",
"com.unity.2d.path": "2.1.1"
"com.unity.2d.common": "6.0.4",
"com.unity.2d.path": "5.0.2",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
},
@ -40,11 +43,22 @@
"source": "builtin",
"dependencies": {}
},
"com.unity.burst": {
"version": "1.6.6",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1"
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.14.15",
"version": "1.17.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
@ -55,16 +69,16 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.2.1",
"version": "3.0.15",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.1"
"com.unity.ext.nunit": "1.0.6"
},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.14",
"version": "2.0.16",
"depth": 0,
"source": "registry",
"dependencies": {
@ -80,12 +94,30 @@
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.1.0",
"version": "1.2.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.4.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.modules.androidjni": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.31",
"depth": 0,
@ -98,7 +130,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.4",
"version": "3.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
@ -107,7 +139,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.18",
"version": "1.6.4",
"depth": 0,
"source": "registry",
"dependencies": {
@ -270,6 +302,18 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}

View File

@ -0,0 +1,17 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

View File

@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

View File

@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!387306366 &1
MemorySettings:
m_ObjectHideFlags: 0
m_EditorMemorySettings:
m_MainAllocatorBlockSize: -1
m_ThreadAllocatorBlockSize: -1
m_MainGfxBlockSize: -1
m_ThreadGfxBlockSize: -1
m_CacheBlockSize: -1
m_TypetreeBlockSize: -1
m_ProfilerBlockSize: -1
m_ProfilerEditorBlockSize: -1
m_BucketAllocatorGranularity: -1
m_BucketAllocatorBucketsCount: -1
m_BucketAllocatorBlockSize: -1
m_BucketAllocatorBlockCount: -1
m_ProfilerBucketAllocatorGranularity: -1
m_ProfilerBucketAllocatorBucketsCount: -1
m_ProfilerBucketAllocatorBlockSize: -1
m_ProfilerBucketAllocatorBlockCount: -1
m_TempAllocatorSizeMain: -1
m_JobTempAllocatorBlockSize: -1
m_BackgroundJobTempAllocatorBlockSize: -1
m_JobTempAllocatorReducedBlockSize: -1
m_TempAllocatorSizeGIBakingWorker: -1
m_TempAllocatorSizeNavMeshWorker: -1
m_TempAllocatorSizeAudioWorker: -1
m_TempAllocatorSizeCloudWorker: -1
m_TempAllocatorSizeGfx: -1
m_TempAllocatorSizeJobWorker: -1
m_TempAllocatorSizeBackgroundWorker: -1
m_TempAllocatorSizePreloadManager: -1
m_PlatformMemorySettings: {}

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2019.4.38f1
m_EditorVersionWithRevision: 2019.4.38f1 (fdbb7325fa47)
m_EditorVersion: 2021.3.12f1
m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1)

View File

@ -0,0 +1,8 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!890905787 &1
VersionControlSettings:
m_ObjectHideFlags: 0
m_Mode: Visible Meta Files
m_CollabEditorSettings:
inProgressEnabled: 1

View File

View File

@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCOverlayIcons: 1
m_VCAllowAsyncUpdate: 0

File diff suppressed because it is too large Load Diff