diff --git a/MoCha/Assets/Items.meta b/MoCha/Assets/Items.meta new file mode 100644 index 0000000..8a326d8 --- /dev/null +++ b/MoCha/Assets/Items.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49f84355758f7f74bbe780ac2fd1e574 +folderAsset: yes +timeCreated: 1524164591 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_eye.asset b/MoCha/Assets/Items/circle_eye.asset new file mode 100644 index 0000000..19fb32f Binary files /dev/null and b/MoCha/Assets/Items/circle_eye.asset differ diff --git a/MoCha/Assets/Items/circle_eye.asset.meta b/MoCha/Assets/Items/circle_eye.asset.meta new file mode 100644 index 0000000..b484390 --- /dev/null +++ b/MoCha/Assets/Items/circle_eye.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 239bd48fa71b8fb44b79bb456aaf0807 +timeCreated: 1524164723 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_head.asset b/MoCha/Assets/Items/circle_head.asset new file mode 100644 index 0000000..0777c27 Binary files /dev/null and b/MoCha/Assets/Items/circle_head.asset differ diff --git a/MoCha/Assets/Items/circle_head.asset.meta b/MoCha/Assets/Items/circle_head.asset.meta new file mode 100644 index 0000000..b0717b6 --- /dev/null +++ b/MoCha/Assets/Items/circle_head.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a921d1e60d69f1a498ba263cdfde04c7 +timeCreated: 1524164686 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/crazy_hair.asset b/MoCha/Assets/Items/crazy_hair.asset new file mode 100644 index 0000000..9e3ed70 Binary files /dev/null and b/MoCha/Assets/Items/crazy_hair.asset differ diff --git a/MoCha/Assets/Items/crazy_hair.asset.meta b/MoCha/Assets/Items/crazy_hair.asset.meta new file mode 100644 index 0000000..4cf3065 --- /dev/null +++ b/MoCha/Assets/Items/crazy_hair.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 642e995dbaf120642aeb269ce5c6c476 +timeCreated: 1524164615 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/crown.asset b/MoCha/Assets/Items/crown.asset new file mode 100644 index 0000000..52585e3 Binary files /dev/null and b/MoCha/Assets/Items/crown.asset differ diff --git a/MoCha/Assets/Items/crown.asset.meta b/MoCha/Assets/Items/crown.asset.meta new file mode 100644 index 0000000..4268a6f --- /dev/null +++ b/MoCha/Assets/Items/crown.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e10fc574df6c4744cbee17e84374f524 +timeCreated: 1524164707 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/gap_mouth.asset b/MoCha/Assets/Items/gap_mouth.asset new file mode 100644 index 0000000..e48c075 Binary files /dev/null and b/MoCha/Assets/Items/gap_mouth.asset differ diff --git a/MoCha/Assets/Items/gap_mouth.asset.meta b/MoCha/Assets/Items/gap_mouth.asset.meta new file mode 100644 index 0000000..321cdb3 --- /dev/null +++ b/MoCha/Assets/Items/gap_mouth.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e59e525161ea38242a90fd6ef67f4b63 +timeCreated: 1524164715 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/pig_nose.asset b/MoCha/Assets/Items/pig_nose.asset new file mode 100644 index 0000000..ae49169 Binary files /dev/null and b/MoCha/Assets/Items/pig_nose.asset differ diff --git a/MoCha/Assets/Items/pig_nose.asset.meta b/MoCha/Assets/Items/pig_nose.asset.meta new file mode 100644 index 0000000..55b7adc --- /dev/null +++ b/MoCha/Assets/Items/pig_nose.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9c001483399829349bae2c3bf3743bc0 +timeCreated: 1524164756 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/ItemSlot.prefab b/MoCha/Assets/Prefabs/ItemSlot.prefab index 141dc69..0c05dbf 100644 Binary files a/MoCha/Assets/Prefabs/ItemSlot.prefab and b/MoCha/Assets/Prefabs/ItemSlot.prefab differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 5226b2a..71beae0 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scripts/Inventory.cs b/MoCha/Assets/Scripts/Inventory.cs index 24ce640..3b52d2d 100644 --- a/MoCha/Assets/Scripts/Inventory.cs +++ b/MoCha/Assets/Scripts/Inventory.cs @@ -7,7 +7,7 @@ public class Inventory : MonoBehaviour { public Image[] itemImages = new Image[numItemSlots]; public Item[] items = new Item[numItemSlots]; - public const int numItemSlots = 4; + public const int numItemSlots = 6; public void AddItem(Item itemToAdd) { for (int i = 0; i < items.Length; i++) diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 5b9c917..1b3e611 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -37,6 +37,12 @@ public class MonsterManager : MonoBehaviour { 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 () @@ -66,5 +72,10 @@ public class MonsterManager : MonoBehaviour { 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/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index 2576b78..27997c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.2.1f1 +m_EditorVersion: 2017.3.1f1