diff --git a/MoCha/Assets/Materials/Background Shade.mat b/MoCha/Assets/Materials/Background Shade.mat index 24b147b..ae96152 100644 Binary files a/MoCha/Assets/Materials/Background Shade.mat and b/MoCha/Assets/Materials/Background Shade.mat differ diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 7ef2903..de38b46 100644 Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 6fe4ffe..b66dd8c 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 0fc5309..9f5418d 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scripts/MonsterDraw.cs b/MoCha/Assets/Scripts/MonsterDraw.cs index 6e9dc54..c3f06ff 100644 --- a/MoCha/Assets/Scripts/MonsterDraw.cs +++ b/MoCha/Assets/Scripts/MonsterDraw.cs @@ -6,13 +6,13 @@ using UnityEngine.UI; public class MonsterDraw : MonoBehaviour { public GameObject anchorPoint; - + public float scale; private Vector2 anchorPos; void Start() { - anchorPos = new Vector2 (anchorPoint.transform.position.x, anchorPoint.transform.position.y); + anchorPos = new Vector3 (anchorPoint.transform.position.x, anchorPoint.transform.position.y, anchorPoint.transform.position.z); loadMonster(); } @@ -25,10 +25,11 @@ public class MonsterDraw : MonoBehaviour { string savedString = PlayerPrefs.GetString(equipped[i]); string[] values = savedString.Split (); GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i])); - //instance.rectTransform.anchoredPosition = new Vector2(float.Parse(values[0]), float.Parse(values[1])); instance.name = equipped [i]; //instance.GetComponent ().inventory = inv; - instance.transform.position = new Vector2(float.Parse(values[0]), float.Parse(values[1])); + instance.transform.position = new Vector3(float.Parse(values[0]), float.Parse(values[1]), float.Parse(values[2])); + instance.transform.localScale -= new Vector3(scale, scale, 0); + } } } diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 24b2b2d..cdbedb2 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -39,43 +39,6 @@ public class MonsterManager : MonoBehaviour { PlayerPrefs.SetString(/*SceneManager.GetActiveScene().name + */monsterParts[i].name, savedString); } PlayerPrefs.SetString ("Equipped", equippedString); - /* - StringBuilder eyePos = new StringBuilder(); - - eyePos.Append(GameObject.Find("circle_eye").transform.position.x).Append(" ").Append(GameObject.Find("circle_eye").transform.position.y).Append(" ").Append(GameObject.Find("circle_eye").transform.position.z); - string savedString = eyePos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "eyePosition", savedString); - - StringBuilder hairPos = new StringBuilder(); - - hairPos.Append(GameObject.Find("crazy_hair").transform.position.x).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.y).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.z); - savedString = hairPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hairPosition", savedString); - - StringBuilder headPos = new StringBuilder(); - - headPos.Append(GameObject.Find("circle_head").transform.position.x).Append(" ").Append(GameObject.Find("circle_head").transform.position.y).Append(" ").Append(GameObject.Find("circle_head").transform.position.z); - savedString = headPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "headPosition", savedString); - - StringBuilder hatPos = new StringBuilder(); - - hatPos.Append(GameObject.Find("crown").transform.position.x).Append(" ").Append(GameObject.Find("crown").transform.position.y).Append(" ").Append(GameObject.Find("crown").transform.position.z); - savedString = hatPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hatPosition", savedString); - - StringBuilder mouthPos = new StringBuilder(); - - mouthPos.Append(GameObject.Find("gap_mouth").transform.position.x).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.y).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.z); - savedString = mouthPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "mouthPosition", savedString); - - StringBuilder nosePos = new StringBuilder(); - - nosePos.Append(GameObject.Find("pig_nose").transform.position.x).Append(" ").Append(GameObject.Find("pig_nose").transform.position.y).Append(" ").Append(GameObject.Find("pig_nose").transform.position.z); - savedString = nosePos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "nosePosition", savedString); - */ } public void loadMonster () @@ -92,37 +55,5 @@ public class MonsterManager : MonoBehaviour { instance.GetComponent ().inventory = inv; instance.transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); } - - /* - string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "eyePosition"); - string[] values = savedString.Split(' '); - - GameObject.Find("circle_eye").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hairPosition"); - values = savedString.Split(' '); - - GameObject.Find("crazy_hair").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "headPosition"); - values = savedString.Split(' '); - - GameObject.Find("circle_head").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hatPosition"); - values = savedString.Split(' '); - - GameObject.Find("crown").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "mouthPosition"); - values = savedString.Split(' '); - - GameObject.Find("gap_mouth").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "nosePosition"); - values = savedString.Split(' '); - - GameObject.Find("pig_nose").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - */ } } diff --git a/MoCha/ProjectSettings/TagManager.asset b/MoCha/ProjectSettings/TagManager.asset index 1db4d5d..2ada0c1 100644 Binary files a/MoCha/ProjectSettings/TagManager.asset and b/MoCha/ProjectSettings/TagManager.asset differ