diff --git a/SurvivalIsland/Assets/Book Assets/Models/outPost.fbx.meta b/SurvivalIsland/Assets/Book Assets/Models/outPost.fbx.meta index 321d06b..055ad2b 100644 --- a/SurvivalIsland/Assets/Book Assets/Models/outPost.fbx.meta +++ b/SurvivalIsland/Assets/Book Assets/Models/outPost.fbx.meta @@ -53,7 +53,7 @@ ModelImporter: 6400010: wood 6400012: wood_001 6400014: wood_002 - 7400002: Default Take + 7400002: idle 7400004: idle 7400006: dooropen 7400008: doorshut @@ -73,16 +73,148 @@ ModelImporter: animationScaleError: .5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: idle + takeName: Default Take + firstFrame: 1 + lastFrame: 2 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: dish + weight: 1 + - path: door + weight: 1 + - path: lamp + weight: 1 + - path: outpost + weight: 1 + - path: table + weight: 1 + - path: wood + weight: 1 + - path: wood_001 + weight: 1 + - path: wood_002 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + - serializedVersion: 16 + name: dooropen + takeName: Default Take + firstFrame: 1 + lastFrame: 15 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: dish + weight: 1 + - path: door + weight: 1 + - path: lamp + weight: 1 + - path: outpost + weight: 1 + - path: table + weight: 1 + - path: wood + weight: 1 + - path: wood_001 + weight: 1 + - path: wood_002 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + - serializedVersion: 16 + name: doorshut + takeName: Default Take + firstFrame: 16 + lastFrame: 29 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: dish + weight: 1 + - path: door + weight: 1 + - path: lamp + weight: 1 + - path: outpost + weight: 1 + - path: table + weight: 1 + - path: wood + weight: 1 + - path: wood_001 + weight: 1 + - path: wood_002 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 1.5 meshCompression: 0 addColliders: 1 importBlendShapes: 1 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 optimizeMeshForGPU: 1 weldVertices: 1 diff --git a/SurvivalIsland/Assets/Scripts.meta b/SurvivalIsland/Assets/Scripts.meta new file mode 100644 index 0000000..1a7205f --- /dev/null +++ b/SurvivalIsland/Assets/Scripts.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 6e824e5173cad6a409d555b283fc8e25 +folderAsset: yes +DefaultImporter: + userData: diff --git a/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs new file mode 100644 index 0000000..647b356 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using System.Collections; + +public class PlayerCollisions : MonoBehaviour { + bool doorIsOpen = false; + float doorTimer = 0.0f; + public float doorOpenTime = 3.0f; + public AudioClip doorOpenSound; + public AudioClip doorShutSound; + + GameObject currentDoor; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + if (doorIsOpen) { + doorTimer += Time.deltaTime; + + if (doorTimer > doorOpenTime) { + Door (doorShutSound, false, "doorshut",currentDoor); + doorTimer = 0.0f; + } + } + } + + void OnControllerColliderHit(ControllerColliderHit hit) { + if (hit.gameObject.tag == "playerDoor" && doorIsOpen == false) { + currentDoor = hit.gameObject; + Door (doorOpenSound, true, "dooropen",currentDoor); + } + } + + void Door(AudioClip aClip, bool openCheck, string animName,GameObject thisDoor) { + thisDoor.audio.PlayOneShot (aClip); + doorIsOpen = openCheck; + thisDoor.transform.parent.animation.Play (animName); + } +} diff --git a/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta new file mode 100644 index 0000000..0a1109e --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 479fe5da19b4fba4b9ea55d26873d375 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/SurvivalIsland.unity b/SurvivalIsland/Assets/SurvivalIsland.unity index abe443e..514d9ea 100644 Binary files a/SurvivalIsland/Assets/SurvivalIsland.unity and b/SurvivalIsland/Assets/SurvivalIsland.unity differ diff --git a/SurvivalIsland/Library/CurrentLayout.dwlt b/SurvivalIsland/Library/CurrentLayout.dwlt index cd59074..dd5ec89 100644 Binary files a/SurvivalIsland/Library/CurrentLayout.dwlt and b/SurvivalIsland/Library/CurrentLayout.dwlt differ diff --git a/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt b/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt index b304233..9a341bd 100644 Binary files a/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt and b/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt differ diff --git a/SurvivalIsland/Library/InspectorExpandedItems.asset b/SurvivalIsland/Library/InspectorExpandedItems.asset index 842d3d7..3349dc6 100644 Binary files a/SurvivalIsland/Library/InspectorExpandedItems.asset and b/SurvivalIsland/Library/InspectorExpandedItems.asset differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index df7ffe8..4049ca9 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll new file mode 100644 index 0000000..714e3bd Binary files /dev/null and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/SurvivalIsland/Library/assetDatabase3 b/SurvivalIsland/Library/assetDatabase3 index c2c0eb2..76ac85c 100644 Binary files a/SurvivalIsland/Library/assetDatabase3 and b/SurvivalIsland/Library/assetDatabase3 differ diff --git a/SurvivalIsland/Library/expandedItems b/SurvivalIsland/Library/expandedItems index bb0d22b..49d6afc 100644 Binary files a/SurvivalIsland/Library/expandedItems and b/SurvivalIsland/Library/expandedItems differ diff --git a/SurvivalIsland/Library/guidmapper b/SurvivalIsland/Library/guidmapper index 463a52b..f1848df 100644 Binary files a/SurvivalIsland/Library/guidmapper and b/SurvivalIsland/Library/guidmapper differ diff --git a/SurvivalIsland/Library/metadata/47/479fe5da19b4fba4b9ea55d26873d375 b/SurvivalIsland/Library/metadata/47/479fe5da19b4fba4b9ea55d26873d375 new file mode 100644 index 0000000..97669dc Binary files /dev/null and b/SurvivalIsland/Library/metadata/47/479fe5da19b4fba4b9ea55d26873d375 differ diff --git a/SurvivalIsland/Library/metadata/6e/6e824e5173cad6a409d555b283fc8e25 b/SurvivalIsland/Library/metadata/6e/6e824e5173cad6a409d555b283fc8e25 new file mode 100644 index 0000000..27fad1d Binary files /dev/null and b/SurvivalIsland/Library/metadata/6e/6e824e5173cad6a409d555b283fc8e25 differ diff --git a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 index c6414fc..f779878 100644 Binary files a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 and b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 differ diff --git a/SurvivalIsland/Library/shadercompiler-1.log b/SurvivalIsland/Library/shadercompiler-1.log index 456fb07..c0dbfce 100644 --- a/SurvivalIsland/Library/shadercompiler-1.log +++ b/SurvivalIsland/Library/shadercompiler-1.log @@ -1,3 +1,3 @@ Base path: D:/Unity/Editor/Data -Pipe name: \\.\pipe\UnityShaderCompiler-1-13164 +Pipe name: \\.\pipe\UnityShaderCompiler-1-7232 Cmd: getPlatforms diff --git a/SurvivalIsland/ProjectSettings/TagManager.asset b/SurvivalIsland/ProjectSettings/TagManager.asset index 8f28fd4..c9d8372 100644 Binary files a/SurvivalIsland/ProjectSettings/TagManager.asset and b/SurvivalIsland/ProjectSettings/TagManager.asset differ