Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
DiZhao
Viking Project
Commits
9fc32a34
Commit
9fc32a34
authored
Oct 13, 2021
by
cdmbillzhao
Browse files
upgrade to Unity 2020
parent
e7177d9c
Changes
21
Expand all
Hide whitespace changes
Inline
Side-by-side
.vsconfig
0 → 100644
View file @
9fc32a34
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
Assets/Scenes/StartingScene.unity
View file @
9fc32a34
This diff is collapsed.
Click to expand it.
Assets/Scenes/StartingSceneSettings.lighting
0 → 100644
View file @
9fc32a34
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!850595691
&4890085278179872738
LightingSettings
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
StartingSceneSettings
serializedVersion
:
3
m_GIWorkflowMode
:
0
m_EnableBakedLightmaps
:
0
m_EnableRealtimeLightmaps
:
1
m_RealtimeEnvironmentLighting
:
1
m_BounceScale
:
1
m_AlbedoBoost
:
1
m_IndirectOutputScale
:
1
m_UsingShadowmask
:
0
m_BakeBackend
:
0
m_LightmapMaxSize
:
1024
m_BakeResolution
:
20
m_Padding
:
2
m_TextureCompression
:
1
m_AO
:
0
m_AOMaxDistance
:
1
m_CompAOExponent
:
1
m_CompAOExponentDirect
:
0
m_ExtractAO
:
0
m_MixedBakeMode
:
1
m_LightmapsBakeMode
:
1
m_FilterMode
:
1
m_LightmapParameters
:
{
fileID
:
15204
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ExportTrainingData
:
0
m_TrainingDataDestination
:
TrainingData
m_RealtimeResolution
:
0.5
m_ForceWhiteAlbedo
:
0
m_ForceUpdates
:
0
m_FinalGather
:
0
m_FinalGatherRayCount
:
256
m_FinalGatherFiltering
:
1
m_PVRCulling
:
1
m_PVRSampling
:
1
m_PVRDirectSampleCount
:
32
m_PVRSampleCount
:
512
m_PVREnvironmentSampleCount
:
512
m_PVREnvironmentReferencePointCount
:
2048
m_LightProbeSampleCountMultiplier
:
4
m_PVRBounces
:
2
m_PVRMinBounces
:
2
m_PVREnvironmentMIS
:
0
m_PVRFilteringMode
:
0
m_PVRDenoiserTypeDirect
:
0
m_PVRDenoiserTypeIndirect
:
0
m_PVRDenoiserTypeAO
:
0
m_PVRFilterTypeDirect
:
0
m_PVRFilterTypeIndirect
:
0
m_PVRFilterTypeAO
:
0
m_PVRFilteringGaussRadiusDirect
:
1
m_PVRFilteringGaussRadiusIndirect
:
5
m_PVRFilteringGaussRadiusAO
:
2
m_PVRFilteringAtrousPositionSigmaDirect
:
0.5
m_PVRFilteringAtrousPositionSigmaIndirect
:
2
m_PVRFilteringAtrousPositionSigmaAO
:
1
Assets/Scenes/StartingSceneSettings.lighting.meta
0 → 100644
View file @
9fc32a34
fileFormatVersion: 2
guid: 568b0bb76bce09a488e379d3ea04508f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Editor/VREditorToggle.cs
deleted
100644 → 0
View file @
e7177d9c
//This script allows us to easily toggle VR Supported on and off using a top level menu item. This is
//an editor script meaning it modifies how the Unity editor actually works. This script has no effect on the
//game project itself
//REMEMBER: To toggle VR Supported normally, go to:
// Edit -> Project Settings -> Player -> Other Settings
using
UnityEngine
;
using
UnityEditor
;
//Enables the use of editor modifying code
using
UnityEngine.VR
;
//Enables us to check VR settings
public
class
VREditorToggle
{
const
string
ONNAME
=
"VR/Enable VR"
;
//The name of our Enable menu item
const
string
OFFNAME
=
"VR/Disable VR"
;
//The name of our Disable menu item
//This method creates the Enable menu item. When the menu item is clicked, the code
//inside this method executes
[
MenuItem
(
ONNAME
)]
static
void
EnableVR
()
{
//Turn VR Supported on
PlayerSettings
.
virtualRealitySupported
=
true
;
}
//This method "validates" the Enable menu item. It is used by the editor to format
//the menu item for us
[
MenuItem
(
ONNAME
,
true
)]
static
bool
EnableValidate
()
{
//If VR Supported is enabled, add a checkmark next to this menu item
Menu
.
SetChecked
(
ONNAME
,
PlayerSettings
.
virtualRealitySupported
);
//Return the opposite of whether or not VR is supported. Thus, if VR Supported is enabled,
//this returns "false". The result is that if VR Support is enabled, this menu item is grayed-out
//and cannot be selected again
return
!
PlayerSettings
.
virtualRealitySupported
;
}
//This method creates the Disable menu item. When the menu item is clicked, the code
//inside this method executes
[
MenuItem
(
OFFNAME
)]
static
void
DisableVR
()
{
//Turn VR Supported off
PlayerSettings
.
virtualRealitySupported
=
false
;
}
//This method "validates" the Disable menu item. It is used by the editor to format
//the menu item for us
[
MenuItem
(
OFFNAME
,
true
)]
static
bool
DisableValidate
()
{
//If VR Supported is disabled, add a checkmark next to this menu item
Menu
.
SetChecked
(
OFFNAME
,
!
PlayerSettings
.
virtualRealitySupported
);
//Return the opposite of whether or not VR is supported. Thus, if VR Supported is disabled,
//this returns "true". The result is that if VR Support is disabled, this menu item is grayed-out
//and cannot be selected again
return
PlayerSettings
.
virtualRealitySupported
;
}
}
Assets/Scripts/Editor/VREditorToggle.cs.meta
deleted
100644 → 0
View file @
e7177d9c
fileFormatVersion: 2
guid: 8584323748e584d4d97cb3697b72ff33
timeCreated: 1471976019
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/UI/ShieldIcon.png.meta
View file @
9fc32a34
fileFormatVersion: 2
guid: e697b6b70749ed54396e7812a75884b1
timeCreated: 1470151717
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
...
...
@@ -20,40 +21,76 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap:
0
generateCubemap:
6
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
serializedVersion: 2
filterMode: 1
aniso: 16
mipBias: -1
wrapMode: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
buildTargetSettings: []
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
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: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/UI/UIElement_Button.png.meta
View file @
9fc32a34
fileFormatVersion: 2
guid: 75d9e266a3e04d14d9aa2e1f34bdff75
timeCreated: 1470679278
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
...
...
@@ -20,40 +21,76 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap:
0
generateCubemap:
6
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -1
wrapMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 34, y: 53, z: 33, w: 24}
spritePixelsToUnits: 100
spriteBorder: {x: 34, y: 53, z: 33, w: 24}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
buildTargetSettings: []
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/UI/UIElement_HUDBase.png.meta
View file @
9fc32a34
fileFormatVersion: 2
guid: f4cf498962fded8459b71b579fe8e945
timeCreated: 1470672995
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
...
...
@@ -20,40 +21,76 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap:
0
generateCubemap:
6
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -1
wrapMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
buildTargetSettings: []
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/UI/UIElement_HUDBase_Flipped.png.meta
View file @
9fc32a34
fileFormatVersion: 2
guid: 413e9ef73bbd6cb4991051fb5e2929fd
timeCreated: 1470675887
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
...
...
@@ -20,40 +21,76 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap:
0
generateCubemap:
6
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -1
wrapMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
buildTargetSettings: []
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/UI/UIElement_HUDIconShield.png.meta
View file @
9fc32a34
fileFormatVersion: 2
guid: 837de0caefbed864aaa21aa969def35e
timeCreated: 1470672995
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
...
...
@@ -20,40 +21,76 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap:
0
generateCubemap:
6
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024