GuardCamera Raycast works

This commit is contained in:
Steven 2017-11-09 02:07:37 -06:00
parent aea5f6382c
commit 4d871b48f8
44 changed files with 1131 additions and 1980 deletions

View file

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Statue
m_Name: MissionObject
m_Shader: {fileID: 4800000, guid: 138071fa1e289e345881d6208d5c5573, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4

View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 4eca8b10933e0f34f8f107d336163c7e
folderAsset: yes
timeCreated: 1510208839
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9b4e827f1baac2a4399e6dd733c1e33e
timeCreated: 1510206043
guid: 76926520885f1c74da70a07536c19651
timeCreated: 1510208843
licenseType: Free
ModelImporter:
serializedVersion: 21

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7010548c0755987489ffb02ec0289e7c
timeCreated: 1510175966
guid: 9eaca07425148b84bb63a735a72f0a40
timeCreated: 1510208845
licenseType: Free
ModelImporter:
serializedVersion: 21
@ -13,7 +13,7 @@ ModelImporter:
7400000: Default Take
9500000: //RootNode
materials:
importMaterials: 0
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
@ -39,19 +39,19 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.5
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
@ -62,7 +62,7 @@ ModelImporter:
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2

Binary file not shown.

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 92865c875de0be3419a3408649d1df04
timeCreated: 1509655101
guid: eebe31a3a62cf544291fbaba2e84528b
timeCreated: 1510208846
licenseType: Free
ModelImporter:
serializedVersion: 21
@ -13,7 +13,7 @@ ModelImporter:
7400000: Default Take
9500000: //RootNode
materials:
importMaterials: 0
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
@ -42,16 +42,16 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
@ -62,7 +62,7 @@ ModelImporter:
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: fbe6719708bfecb4aa43ca5e95337d9c
timeCreated: 1508850211
guid: 385db36e889d93b49a12abda50c60e25
timeCreated: 1510208840
licenseType: Free
ModelImporter:
serializedVersion: 21
@ -13,7 +13,7 @@ ModelImporter:
7400000: Default Take
9500000: //RootNode
materials:
importMaterials: 0
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
@ -39,13 +39,13 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.2
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
@ -62,7 +62,7 @@ ModelImporter:
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2

Binary file not shown.

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 5c659163943c4b544b760fd23d89f66d
timeCreated: 1508849935
guid: 4ada612e416a096428898316ac84275e
timeCreated: 1510208842
licenseType: Free
ModelImporter:
serializedVersion: 21
@ -13,7 +13,7 @@ ModelImporter:
7400000: Default Take
9500000: //RootNode
materials:
importMaterials: 0
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
@ -39,13 +39,13 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.3
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
@ -62,7 +62,7 @@ ModelImporter:
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2

View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: d5e160622f03d2740b3298e78ce3f1ba
folderAsset: yes
timeCreated: 1510208845
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,76 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: No Name
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 5a09eeae79deb374f81afdccb4cf674b
timeCreated: 1510208845
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,95 @@
fileFormatVersion: 2
guid: a37cdb9bad5b71943923b13ce79be4d0
timeCreated: 1510208845
licenseType: Free
ModelImporter:
serializedVersion: 21
fileIDToRecycleName:
100000: Camera
100002: //RootNode
100004: Cube
100006: Lamp
400000: Camera
400002: //RootNode
400004: Cube
400006: Lamp
2000000: Camera
2300000: Cube
3300000: Cube
4300000: Cube
10800000: Lamp
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,87 @@
fileFormatVersion: 2
guid: b0fcd2c68ef5cf148b7e650a0b026b96
timeCreated: 1510208845
licenseType: Free
ModelImporter:
serializedVersion: 21
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Cube
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,87 @@
fileFormatVersion: 2
guid: 9d5aaa24b59341a4fa10f52e763c9db2
timeCreated: 1510208843
licenseType: Free
ModelImporter:
serializedVersion: 21
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Cube
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f1d38ea6f4a30c14e826037e86106cfb
timeCreated: 1509473003
guid: de87650a401f4a94daab6af7128a577f
timeCreated: 1510208839
licenseType: Free
DefaultImporter:
userData:

Binary file not shown.

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e8490e200af33bc4dbffce3aff86be5c
timeCreated: 1510208839
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2ac040b77839c714483c02c1ae1b9481
timeCreated: 1510208839
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View file

@ -11,6 +11,23 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1889434021946074}
m_IsPrefabParent: 1
--- !u!1 &1374339161963754
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4695271445839178}
- component: {fileID: 20960955616270498}
- component: {fileID: 114650517288927094}
m_Layer: 0
m_Name: GlowPrePassCamera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1889434021946074
GameObject:
m_ObjectHideFlags: 0
@ -25,7 +42,8 @@ GameObject:
- component: {fileID: 81070402336043930}
- component: {fileID: 114214698486704570}
- component: {fileID: 114503650767683602}
- component: {fileID: 108724348204580334}
- component: {fileID: 108796398514616960}
- component: {fileID: 114616545285086590}
m_Layer: 0
m_Name: Guard Camera
m_TagString: GuardCamera
@ -58,13 +76,14 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889434021946074}
m_LocalRotation: {x: -0.18472917, y: 0.3749558, z: -0.07651737, w: -0.9052229}
m_LocalPosition: {x: 4, y: 4.33, z: -4}
m_LocalPosition: {x: 9, y: 3, z: -9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4695271445839178}
- {fileID: 4663376666333470}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 23.068, y: 315, z: 0}
m_LocalEulerAnglesHint: {x: 33.817, y: -139.944, z: 0}
--- !u!4 &4663376666333470
Transform:
m_ObjectHideFlags: 1
@ -76,6 +95,19 @@ Transform:
m_LocalScale: {x: 0.25, y: 0.25, z: 0.75}
m_Children: []
m_Father: {fileID: 4661043116803332}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4695271445839178
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1374339161963754}
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_Children: []
m_Father: {fileID: 4661043116803332}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20437103875467350
@ -99,6 +131,42 @@ Camera:
field of view: 50
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 1
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!20 &20960955616270498
Camera:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1374339161963754}
m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 50
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -107,7 +175,7 @@ Camera:
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_HDR: 0
m_AllowMSAA: 1
m_ForceIntoRT: 0
m_OcclusionCulling: 1
@ -179,13 +247,13 @@ Behaviour:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889434021946074}
m_Enabled: 1
--- !u!108 &108724348204580334
--- !u!108 &108796398514616960
Light:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889434021946074}
m_Enabled: 0
m_Enabled: 1
serializedVersion: 8
m_Type: 0
m_Color: {r: 1, g: 0, b: 0, a: 1}
@ -211,20 +279,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
@ -240,6 +294,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b4e3fd11940c1048a7e28e5dfc80560, type: 3}
m_Name:
m_EditorClassIdentifier:
mCamera: {fileID: 0}
glowPrePassCamera: {fileID: 1374339161963754}
--- !u!114 &114503650767683602
MonoBehaviour:
m_ObjectHideFlags: 1
@ -266,6 +322,32 @@ MonoBehaviour:
instantiationId: -1
currentMasterID: -1
isRuntimeInstantiated: 0
--- !u!114 &114616545285086590
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1889434021946074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c93cbc6a57a861b4790af0898dde17a2, type: 3}
m_Name:
m_EditorClassIdentifier:
Intensity: 2
glowCompositeShader: {fileID: 4800000, guid: 874640b11a2bbe24a8655c75d3544e5a, type: 3}
--- !u!114 &114650517288927094
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1374339161963754}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 618a83da395ad1d43ae9fa7ed4c1febe, type: 3}
m_Name:
m_EditorClassIdentifier:
glowShader: {fileID: 4800000, guid: 39d85d8c36c331e46af6e70a2b4e8d80, type: 3}
blurShader: {fileID: 4800000, guid: f956270686a9d9e45bea04cd985135cc, type: 3}
--- !u!124 &124909405360866564
Behaviour:
m_ObjectHideFlags: 1

View file

@ -71,4 +71,6 @@ MonoBehaviour:
- CaughtSpy
- AddPlayer
- RemovePlayer
- CaughtSpyRPC
- GuardCaughtNPCRPC
DisableAutoOpenWizard: 1

View file

@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e84829fa9f855a42b9c35f7eb3b3dc0, type: 3}
m_Name: HideMessage
m_EditorClassIdentifier:
interactionDescription: hide a secret message
receiverDescription: N/A
initiatorAnimationTrigger: 8
objectAnimationTrigger: 0
result: 1
initialRotation: 0
objectInitialRotation: 0
interactionDistance: 1.5

View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e125e39ca0f6e6e4780c0fbd3ae81f0f
timeCreated: 1507179270
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e84829fa9f855a42b9c35f7eb3b3dc0, type: 3}
m_Name: ObserveObject
m_EditorClassIdentifier:
interactionDescription: observe the object
receiverDescription: N/A
initiatorAnimationTrigger: 5
objectAnimationTrigger: 0
result: 0
initialRotation: 0
objectInitialRotation: 0
interactionDistance: 1.5

View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: d766914728de7d443b8ef27ca1e86080
timeCreated: 1507179270
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 81dcf7f0f9bbf8d489e54b8112156b28
timeCreated: 1510205057
timeCreated: 1510208134
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 23800000

View file

@ -11,7 +11,7 @@ public class NpcApproachingTargetAction : Action
public override void Act(StateController controller)
{
controller.Destination = controller.SelectedObject.transform.position;
controller.MoveToSelectedObject();
}
public override void EndAct(StateController controller)

View file

@ -129,11 +129,10 @@ public abstract class SelectableObject : Photon.PunBehaviour, IEquatable<Selecta
private void OnMouseEnter()
{
if (!isSpy)
if (!isSpy || !photonView.isMine)
{
isMousedOver = true;
else if (!photonView.isMine)
isMousedOver = true;
}
}
private void OnMouseExit()

View file

@ -3,8 +3,9 @@ using UnityEngine;
public class GuardCamera : Photon.PunBehaviour {
public Camera mCamera;
private Light mSpotlight;
private Camera mCamera;
private AudioListener mListener;
private float xRotation = 0.0f;
@ -12,6 +13,9 @@ public class GuardCamera : Photon.PunBehaviour {
private List<int> mPlayers; // Photo Player IDs
[SerializeField]
private GameObject glowPrePassCamera;
void Start()
{
// Get components
@ -47,6 +51,9 @@ public class GuardCamera : Photon.PunBehaviour {
// Turn on this camera for the player.
mCamera.enabled = true;
mListener.enabled = true;
glowPrePassCamera.GetComponent<Camera>().enabled = true;
glowPrePassCamera.GetComponent<GlowPrePass>().enabled = true;
GetComponent<GlowComposite>().enabled = true;
// Trigger adding a player to this camera.
photonView.RPC("AddPlayer", PhotonTargets.All, PhotonNetwork.player.ID);
@ -60,6 +67,9 @@ public class GuardCamera : Photon.PunBehaviour {
// Turn off this camera for the player.
mCamera.enabled = false;
mListener.enabled = false;
glowPrePassCamera.GetComponent<Camera>().enabled = false;
glowPrePassCamera.GetComponent<GlowPrePass>().enabled = false;
GetComponent<GlowComposite>().enabled = false;
// Trigger removing a player from this camera.
photonView.RPC("RemovePlayer", PhotonTargets.All, PhotonNetwork.player.ID);

View file

@ -73,7 +73,12 @@ public class GuardController : Photon.PunBehaviour {
SetCameraText();
}
void Update()
GuardCamera GetCurrentGuardCamera()
{
return mCameras[mCurrentCamera];
}
void Update()
{
if (Input.GetKeyDown("space") || mCurrentCamera == -1)
{
@ -88,25 +93,23 @@ public class GuardController : Photon.PunBehaviour {
SetCameraText();
}
/*RaycastHit hit;
if (Input.GetButtonDown("Fire1"))
{
Ray ray = GetComponent<Camera>().ScreenPointToRay(Input.mousePosition);
RaycastHit hit;
Ray ray = GetCurrentGuardCamera().mCamera.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out hit, 100.0f))
{
if (hit.transform.gameObject.tag == "NPC")
{
var manager = GameObject.FindGameObjectWithTag("GameManager").GetComponent<GameManager>();
manager.photonView.RPC("ShowSpiesWinScreen", PhotonTargets.All);
ScorePanelController.GuardCaughtNPC();
}
else if (hit.transform.gameObject.tag == "Spy")
{
var manager = GameObject.FindGameObjectWithTag("GameManager").GetComponent<GameManager>();
manager.photonView.RPC("ShowGuardsWinScreen", PhotonTargets.All);
ScorePanelController.CaughtSpy();
}
}
}*/
}
if (Input.GetAxis("Horizontal") == 0 && Input.GetAxis("Vertical") == 0)
{
@ -115,6 +118,6 @@ public class GuardController : Photon.PunBehaviour {
float xRotation = Time.deltaTime * Input.GetAxis("Horizontal") * CAMERA_SENSITIVITY;
float yRotation = Time.deltaTime * -Input.GetAxis("Vertical") * CAMERA_SENSITIVITY;
mCameras[mCurrentCamera].Rotate(xRotation, yRotation);
GetCurrentGuardCamera().Rotate(xRotation, yRotation);
}
}

View file

@ -38,6 +38,16 @@ public class ScorePanelController : Photon.PunBehaviour {
ActivePanel.photonView.RPC("CompleteMissionRPC", PhotonTargets.All);
}
public static void CaughtSpy()
{
ActivePanel.photonView.RPC("CaughtSpyRPC", PhotonTargets.All);
}
public static void GuardCaughtNPC()
{
ActivePanel.photonView.RPC("GuardCaughtNPCRPC", PhotonTargets.All);
}
#region Coroutines
IEnumerator TimerUpdate()
{
@ -158,11 +168,20 @@ public class ScorePanelController : Photon.PunBehaviour {
}
[PunRPC]
void CaughtSpy()
void CaughtSpyRPC()
{
Debug.Log("Spy Caught!");
_numGuardPoints++;
StartCoroutine(MissionCooldown());
StartCoroutine(IncreaseScoreBarAnimation(_guardScore, (float)_numGuardPoints / _maxGuardPoints));
}
[PunRPC]
void GuardCaughtNPCRPC()
{
Debug.Log("Guard caught an NPC! Giving points to spies!");
_missionsComplete++;
StartCoroutine(MissionCooldown());
StartCoroutine(IncreaseScoreBarAnimation(_spyScore, (float)_missionsComplete / _numOfMissions));
}

View file

@ -368,6 +368,9 @@ PlayerSettings:
switchUdpSendBufferSize: 9
switchUdpReceiveBufferSize: 42
switchSocketBufferEfficiency: 4
switchSocketInitializeEnabled: 1
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath: