diff --git a/Guardian of Silverkeep/Assets/New Terrain 1.asset b/Guardian of Silverkeep/Assets/New Terrain 1.asset index 96546f1..edde105 100644 Binary files a/Guardian of Silverkeep/Assets/New Terrain 1.asset and b/Guardian of Silverkeep/Assets/New Terrain 1.asset differ diff --git a/Guardian of Silverkeep/Assets/New Terrain.asset b/Guardian of Silverkeep/Assets/New Terrain.asset index f174a10..fef26b4 100644 Binary files a/Guardian of Silverkeep/Assets/New Terrain.asset and b/Guardian of Silverkeep/Assets/New Terrain.asset differ diff --git a/Guardian of Silverkeep/Assets/Scripts/Enemy_StandardWeak.cs b/Guardian of Silverkeep/Assets/Scripts/Enemy_StandardWeak.cs index 97a5c86..24a0a59 100644 --- a/Guardian of Silverkeep/Assets/Scripts/Enemy_StandardWeak.cs +++ b/Guardian of Silverkeep/Assets/Scripts/Enemy_StandardWeak.cs @@ -13,6 +13,10 @@ public class Enemy_StandardWeak : MonoBehaviour private CharacterController controller; //this is a test for child toggle public GameObject testChild001; + public GameObject water_baddie_front; + public GameObject water_baddie_back; + public GameObject water_baddie_left; + public GameObject water_baddie_right; @@ -44,6 +48,14 @@ public class Enemy_StandardWeak : MonoBehaviour void Start () { StartCoroutine(EnemyBehavior()); + water_baddie_back = GameObject.Find("water_baddie_back"); + water_baddie_front = GameObject.Find("water_baddie_front"); + water_baddie_left = GameObject.Find("water_baddie_left"); + water_baddie_right = GameObject.Find("water_baddie_right"); + water_baddie_back.SetActive(false); + water_baddie_left.SetActive(false); + water_baddie_right.SetActive(false); + water_baddie_front.SetActive(true); } // Update is called once per frame diff --git a/Guardian of Silverkeep/Assets/Scripts/JoyStone.cs b/Guardian of Silverkeep/Assets/Scripts/JoyStone.cs index 5e68332..7ae8f73 100644 --- a/Guardian of Silverkeep/Assets/Scripts/JoyStone.cs +++ b/Guardian of Silverkeep/Assets/Scripts/JoyStone.cs @@ -34,7 +34,7 @@ public class JoyStone : MonoBehaviour if( distanceToHeroSqrf <= moneySuckRangeSqr) { float amtToMove = jstoneMovingSpeed * Time.deltaTime; - transform.Translate( (heroPosition - selfPosition) * amtToMove); + transform.Translate( (heroPosition - selfPosition) * amtToMove,Space.World); } } //when collide with player call player addscore func to gain score diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/DawnDusk Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/DawnDusk Skybox.mat index 39563e0..a1eed16 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/DawnDusk Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/DawnDusk Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Eerie Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Eerie Skybox.mat index c3867aa..5a87fff 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Eerie Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Eerie Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/MoonShine Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/MoonShine Skybox.mat index 2509a1e..c69b199 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/MoonShine Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/MoonShine Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast1 Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast1 Skybox.mat index f1351a2..4059d3b 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast1 Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast1 Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat index 939d797..dd0a380 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/StarryNight Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/StarryNight Skybox.mat index 02ce8b6..793ca51 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/StarryNight Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/StarryNight Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat index 11d0dd9..d1a5ff1 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny2 Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny2 Skybox.mat index adc543f..37122bb 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny2 Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny2 Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny3 Skybox.mat b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny3 Skybox.mat index cc3dac6..7a0c267 100644 Binary files a/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny3 Skybox.mat and b/Guardian of Silverkeep/Assets/Standard Assets/Skyboxes/Sunny3 Skybox.mat differ diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat new file mode 100644 index 0000000..65be637 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: joystone 1 + m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat.meta new file mode 100644 index 0000000..bd47420 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 1.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f0118b99558594f249e363d388a51b0c +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat new file mode 100644 index 0000000..99e63a6 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: joystone 2 + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat.meta new file mode 100644 index 0000000..fc092e9 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 2.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f5bedc519bd734f3998b6ac9fa1e91a1 +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat new file mode 100644 index 0000000..19d08e1 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: joystone 3 + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat.meta new file mode 100644 index 0000000..a8d1249 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone 3.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: a4d0b4a308d4140cca1724386212e7a1 +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat new file mode 100644 index 0000000..428af26 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: joystone + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 7e53829d09be4594eafd649733610e44, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat.meta new file mode 100644 index 0000000..3e04ea7 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/joystone.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 2c9ad2642863043c495b1775bcf42037 +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/joystone.png.meta b/Guardian of Silverkeep/Assets/Texture/Materials/joystone.png.meta index fa65e1c..4a75370 100644 --- a/Guardian of Silverkeep/Assets/Texture/Materials/joystone.png.meta +++ b/Guardian of Silverkeep/Assets/Texture/Materials/joystone.png.meta @@ -23,7 +23,7 @@ TextureImporter: textureFormat: -1 maxTextureSize: 1024 textureSettings: - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -1 wrapMode: -1