Browse Source

Setup hotspots

master
JoshuaReason 5 years ago
parent
commit
482431eab4
10 changed files with 243 additions and 63 deletions
  1. +9
    -7
      Assets/FBX/terrain_Prefabs/terr1.prefab
  2. +9
    -7
      Assets/FBX/terrain_Prefabs/terr2.prefab
  3. +9
    -7
      Assets/FBX/terrain_Prefabs/terr3.prefab
  4. +9
    -7
      Assets/FBX/terrain_Prefabs/terr4.prefab
  5. +2
    -0
      Assets/Prefabs/RealLocalPlayer.prefab
  6. +179
    -33
      Assets/Scenes/MainScene.unity
  7. +8
    -0
      Assets/Shaders.meta
  8. +2
    -2
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
  9. +8
    -0
      Assets/WorldAssets.meta
  10. +8
    -0
      Assets/WorldAssets/Models.meta

+ 9
- 7
Assets/FBX/terrain_Prefabs/terr1.prefab View File

@ -7160,7 +7160,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1933949658247600}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -8232,7 +8232,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1561181179251006}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9768,7 +9768,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1867116619251534}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9875,7 +9875,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1795522719199480}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -11874,7 +11874,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1428760285532440}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -12124,7 +12124,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1503465554991826}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -16118,7 +16118,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
LandMarkLocations:
- {fileID: 4015060348378174}
- {fileID: 4858066159087758}
--- !u!136 &136483726204993768
CapsuleCollider:
m_ObjectHideFlags: 1

+ 9
- 7
Assets/FBX/terrain_Prefabs/terr2.prefab View File

@ -6825,7 +6825,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1090554840895648}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -7757,7 +7757,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1621612837464430}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -8510,7 +8510,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1480342808725224}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9759,7 +9759,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1517180055028490}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -11366,7 +11366,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1982624764288064}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -12364,7 +12364,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1207739670061228}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -16325,7 +16325,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
LandMarkLocations:
- {fileID: 4547753344381702}
- {fileID: 4909938023563566}
--- !u!136 &136868085561158672
CapsuleCollider:
m_ObjectHideFlags: 1

+ 9
- 7
Assets/FBX/terrain_Prefabs/terr3.prefab View File

@ -7971,7 +7971,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1531538006388946}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -8220,7 +8220,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1840444605343044}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9216,7 +9216,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1723279772655426}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9394,7 +9394,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1613679868389140}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -9999,7 +9999,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1961440781403566}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -10388,7 +10388,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1530035508865966}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -17357,7 +17357,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
LandMarkLocations:
- {fileID: 4774338836106972}
- {fileID: 4738830767809180}
--- !u!136 &136093957553854336
CapsuleCollider:
m_ObjectHideFlags: 1

+ 9
- 7
Assets/FBX/terrain_Prefabs/terr4.prefab View File

@ -6138,7 +6138,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1601293476158298}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -6953,7 +6953,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1422632991479670}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -7345,7 +7345,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1736061920584232}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -7417,7 +7417,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1217599321344058}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -8588,7 +8588,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1428413882349752}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -8625,7 +8625,7 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1633126069868050}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -11544,7 +11544,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations: []
LandMarkLocations:
- {fileID: 4703198377593420}
- {fileID: 4771356939542042}
--- !u!136 &136068552619605964
CapsuleCollider:
m_ObjectHideFlags: 1

+ 2
- 0
Assets/Prefabs/RealLocalPlayer.prefab View File

@ -1207,6 +1207,8 @@ MonoBehaviour:
Name:
Image: {fileID: 0}
playerModel: {fileID: 1706194438886280}
playerAnim: {fileID: 95357577853386682}
dummieAnims: []
scale: 0.1
charControl: {fileID: 143426586791887808}
Animator: {fileID: 95357577853386682}

+ 179
- 33
Assets/Scenes/MainScene.unity View File

@ -550,6 +550,75 @@ MonoBehaviour:
_GameObjectFocus: {fileID: 0}
_FocusMode: 0
quadShader: {fileID: 4800000, guid: 2861e5c5d9ee53c4880db939fa31de53, type: 3}
--- !u!1 &225438893
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 225438894}
- component: {fileID: 225438896}
- component: {fileID: 225438895}
m_Layer: 5
m_Name: FogVolume Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &225438894
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 225438893}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 1536642771}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 110, y: 320}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &225438895
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 225438893}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 92dc32887d2555f469466609a34e858c, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &225438896
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 225438893}
m_CullTransparentMesh: 0
--- !u!1 &252633541
GameObject:
m_ObjectHideFlags: 0
@ -1422,7 +1491,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 1269054385101070, guid: 6cc48b09cd810f14187e04b20b7bf89c, type: 2}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1813471760084128, guid: 6cc48b09cd810f14187e04b20b7bf89c, type: 2}
propertyPath: m_Layer
@ -1468,6 +1537,37 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cc48b09cd810f14187e04b20b7bf89c, type: 2}
m_IsPrefabAsset: 0
--- !u!84 &463266821
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: FogVolumeShadowMap
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 12
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &497923737
GameObject:
m_ObjectHideFlags: 0
@ -2489,37 +2589,6 @@ MonoBehaviour:
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!84 &990137280
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: FogVolumeShadowMap
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 12
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1001341747
GameObject:
m_ObjectHideFlags: 0
@ -3475,7 +3544,7 @@ Camera:
serializedVersion: 2
m_Bits: 0
m_RenderingPath: -1
m_TargetTexture: {fileID: 990137280}
m_TargetTexture: {fileID: 463266821}
m_TargetDisplay: 0
m_TargetEye: 0
m_HDR: 1
@ -3644,6 +3713,83 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1465134982}
m_CullTransparentMesh: 0
--- !u!1 &1536642768
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1536642771}
- component: {fileID: 1536642770}
- component: {fileID: 1536642769}
m_Layer: 5
m_Name: FogVolume Debug Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &1536642769
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1536642768}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &1536642770
Canvas:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1536642768}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &1536642771
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1536642768}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 225438894}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1587103742
GameObject:
m_ObjectHideFlags: 1

+ 8
- 0
Assets/Shaders.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f87a054963b01dc4c8aa2e3ffedcca21
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 2
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38b4c1187c1da4157597d991678c2d90db97d25a3da38965538145260411089e
size 1075096
oid sha256:c1bd7d5f85eeb7c15819d238f5240153021a545feb89f2fe37206d8b79e0218f
size 2173979

+ 8
- 0
Assets/WorldAssets.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7da0e8d0a6415f944aa43dff57b38ae3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/WorldAssets/Models.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c207356b78ec8e8499bb6047218dd104
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save