helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'Shumpei' into portals-and-body

Browse Source 
# Conflicts:
#	Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
#	Assets/Project Files/Scripts/Shumpei.meta
#	Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta
This commit is contained in:
LAPTOP-NFGSIHNQ\shump
2022-03-25 10:46:05 +02:00
parent e6cfaaf188 e2e9f175bb
commit c10f3421f5
24 changed files with 293 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1766
Assets/Scenes/DO_NOT_TOUCH.unity
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/DO_NOT_TOUCH.unity.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9fc0d4010bbf28b4594072e72b8655ab
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

64
Assets/Scenes/SampleSceneSettings.lighting
View File

@@ -1,64 +0,0 @@
%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: SampleSceneSettings
serializedVersion: 4
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
m_BakeBackend: 1
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_LightmapCompression: 3
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 2
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
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: 500
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 2
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
m_PVRTiledBaking: 0

8
Assets/Scenes/SampleSceneSettings.lighting.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2a989f489bfa4b04fb91f9bb7498e4fd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Scenes/Shrumpei.meta → Assets/Scenes/Shumpei.meta
View File

197
Assets/Scenes/Shrumpei/SampleScene.unity → Assets/Scenes/Shumpei/SampleScene.unity
View File

@@ -677,6 +677,7 @@ Transform:
- {fileID: 1986139476}
- {fileID: 492689959}
- {fileID: 2088577709}
- {fileID: 1319628113}
m_Father: {fileID: 1578543176}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -788,6 +789,7 @@ GameObject:
m_Component:
- component: {fileID: 705507995}
- component: {fileID: 705507994}
- component: {fileID: 705507996}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@@ -872,6 +874,57 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &705507996
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
--- !u!1 &1319628112
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1319628113}
m_Layer: 0
m_Name: ForwardDirection
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1319628113
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1319628112}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 508810528}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1578543174
GameObject:
m_ObjectHideFlags: 0
@@ -882,6 +935,7 @@ GameObject:
m_Component:
- component: {fileID: 1578543176}
- component: {fileID: 1578543175}
- component: {fileID: 1578543177}
m_Layer: 0
m_Name: XR Origin
m_TagString: Untagged
@@ -914,7 +968,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1578543174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5, y: 26.339746, z: -12}
m_LocalPosition: {x: -3.29, y: 1, z: -12}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -922,6 +976,23 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1578543177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1578543174}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb6b66c1ad57ba249be7d5b3edef8a9e, type: 3}
m_Name:
m_EditorClassIdentifier:
LeftHand: {fileID: 492689958}
RightHand: {fileID: 2088577708}
CenterEyeCamera: {fileID: 1986139475}
ForwardDirection: {fileID: 1319628112}
Speed: 200
--- !u!1 &1651537451
GameObject:
m_ObjectHideFlags: 0
@@ -934,6 +1005,8 @@ GameObject:
- component: {fileID: 1651537454}
- component: {fileID: 1651537453}
- component: {fileID: 1651537452}
- component: {fileID: 1651537457}
- component: {fileID: 1651537456}
m_Layer: 0
m_Name: Locomotion System
m_TagString: Untagged
@@ -948,7 +1021,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651537451}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12, type: 3}
m_Name:
@@ -991,7 +1064,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651537451}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01f69dc1cb084aa42b2f2f8cd87bc770, type: 3}
m_Name:
@@ -1026,6 +1099,90 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1651537456
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651537451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_System: {fileID: 1651537454}
m_MoveSpeed: 10
m_EnableStrafe: 1
m_UseGravity: 1
m_GravityApplicationMode: 0
m_ForwardSource: {fileID: 0}
m_LeftHandMoveAction:
m_UseReference: 1
m_Action:
m_Name: Left Hand Move
m_Type: 0
m_ExpectedControlType:
m_Id: 75f1b245-c357-48c8-9acb-8967bec9dda2
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 6972639530819350904, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
m_RightHandMoveAction:
m_UseReference: 0
m_Action:
m_Name: Right Hand Move
m_Type: 0
m_ExpectedControlType:
m_Id: 6bf6c732-e011-46b1-acc5-b649a4ec5f10
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: -8198699208435500284, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
--- !u!114 &1651537457
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651537451}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927, type: 3}
m_Name:
m_EditorClassIdentifier:
m_System: {fileID: 1651537454}
m_TurnSpeed: 60
m_LeftHandTurnAction:
m_UseReference: 0
m_Action:
m_Name: Left Hand Turn
m_Type: 0
m_ExpectedControlType:
m_Id: b9ac2485-f305-451c-9106-d1d25cc235dc
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 1010738217276881514, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
m_RightHandTurnAction:
m_UseReference: 1
m_Action:
m_Name: Right Hand Turn
m_Type: 0
m_ExpectedControlType:
m_Id: 93119ec4-ae3b-41c0-8fb4-7ff4c5e6f732
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
--- !u!1 &1986139475
GameObject:
m_ObjectHideFlags: 0
@@ -1038,6 +1195,7 @@ GameObject:
- component: {fileID: 1986139479}
- component: {fileID: 1986139478}
- component: {fileID: 1986139477}
- component: {fileID: 1986139480}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -1184,6 +1342,39 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &1986139480
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1986139475}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!1 &1989791149
GameObject:
m_ObjectHideFlags: 0

0
Assets/Scenes/Shrumpei/SampleScene.unity.meta → Assets/Scenes/Shumpei/SampleScene.unity.meta
View File