diff --git a/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta new file mode 100644 index 0000000..47c11f1 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: ab392ccfd0fbdbb419b0edd49d9ffe20 +timeCreated: 1485052411 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: Group48238 + 100002: //RootNode + 400000: Group48238 + 400002: //RootNode + 2300000: Group48238 + 3300000: Group48238 + 4300000: Group48238 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 0.0666 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 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 + 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: diff --git a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs index 1150dc0..b2877ea 100644 --- a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs +++ b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs @@ -17,13 +17,17 @@ public class HidingSpot : MonoBehaviour { } void OnTriggerEnter(Collider other) { - if (other.gameObject.CompareTag("Player")) + if (other.gameObject.CompareTag("Player")) { Searchlight.playerHidden = true; + Debug.Log("player here"); + } } void OnTriggerExit(Collider other) { - if (other.gameObject.CompareTag("Player")) + if (other.gameObject.CompareTag("Player")) { Searchlight.playerHidden = false; + Debug.Log("player exit"); + } } } diff --git a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs index 5c354d0..a2dce54 100644 --- a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs +++ b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs @@ -47,7 +47,7 @@ public class Searchlight : MonoBehaviour void OnTriggerEnter(Collider other) { - if (other.tag != "Player") + if (other.tag != "Player" || playerHidden ) return; chased = other; isTriggering = true; @@ -64,7 +64,7 @@ public class Searchlight : MonoBehaviour void OnTriggerExit(Collider other) { - if (other.tag != "Player" || playerHidden) + if (other.tag != "Player" ) return; isTriggering = false; if (state == SearchState.Chasing && !isTriggeringAtLeastOne()) diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta new file mode 100644 index 0000000..ffdd440 --- /dev/null +++ b/IronToad_UnityProject/Assets/Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2a6e699820a38a544acfc0015eb679a2 +folderAsset: yes +timeCreated: 1484972317 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta new file mode 100644 index 0000000..47507ca --- /dev/null +++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 338533d5d159c00478a9fb5321b7d922 +folderAsset: yes +timeCreated: 1485007190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 9d75dbc..ac1a0ba 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ diff --git a/IronToad_UnityProject/Assets/water/Water.mat b/IronToad_UnityProject/Assets/water/Water.mat index faf0bbc..d7600b2 100644 Binary files a/IronToad_UnityProject/Assets/water/Water.mat and b/IronToad_UnityProject/Assets/water/Water.mat differ