Merge pull request #127 from EnginyeriaSofwareUB/develop

Develop
EnginyeriaSofwareUB · Nov 29, 2017 · 4f3473a · 4f3473a
2 parents 78121f0 + 7318bda
commit 4f3473a
Show file tree

Hide file tree

Showing 34 changed files with 2,782 additions and 485 deletions.
diff --git a/Unity/Assets/Plugins/InventoryMaster/Resources/AttributeDatabase.asset b/Unity/Assets/Plugins/InventoryMaster/Resources/AttributeDatabase.asset
@@ -26,3 +26,9 @@ MonoBehaviour:
     attributeValue: 0
   - attributeName: Vida
     attributeValue: 0
+  - attributeName: Teletransporte
+    attributeValue: 0
+  - attributeName: Cohete
+    attributeValue: 0
+  - attributeName: Rayo
+    attributeValue: 0
diff --git a/Unity/Assets/Plugins/InventoryMaster/Resources/ItemDatabase.asset b/Unity/Assets/Plugins/InventoryMaster/Resources/ItemDatabase.asset
@@ -36,12 +36,12 @@ MonoBehaviour:
     itemValue: 1
     itemType: 2
     itemWeight: 0
-    maxStack: 1
+    maxStack: 10
     indexItemInList: 999
     rarity: 0
     itemAttributes:
-    - attributeName: Health
-      attributeValue: 10
+    - attributeName: Vida
+      attributeValue: 2
   - itemName: Botiquin
     itemID: 2
     itemDesc: Botiquin
@@ -51,73 +51,51 @@ MonoBehaviour:
     itemValue: 1
     itemType: 2
     itemWeight: 0
-    maxStack: 1
+    maxStack: 10
     indexItemInList: 999
     rarity: 0
     itemAttributes:
-    - attributeName: Health
-      attributeValue: 20
-  - itemName: Angel
+    - attributeName: Vida
+      attributeValue: 3
+  - itemName: Cohete
     itemID: 3
-    itemDesc: 
-    itemIcon: {fileID: 21300000, guid: 9ab69b97d59a14283bf959a1940d240c, type: 3}
-    itemModel: {fileID: 1812569235095272, guid: 618883c171df34085bb6b6042f0ec679,
+    itemDesc: Cohete
+    itemIcon: {fileID: 21300000, guid: 3fddc95690d149e4e82dd1329960736b, type: 3}
+    itemModel: {fileID: 1663579228098034, guid: 5973b77ecb3144920954840e8e20b0f7,
       type: 2}
     itemValue: 1
     itemType: 2
     itemWeight: 0
-    maxStack: 1
+    maxStack: 10
     indexItemInList: 999
     rarity: 0
-    itemAttributes: []
-  - itemName: Escut
+    itemAttributes:
+    - attributeName: Cohete
+      attributeValue: 200
+  - itemName: Teletransporte
     itemID: 4
-    itemDesc: 
-    itemIcon: {fileID: 21300000, guid: cbf21f9c2dc6657478d8020c5cb2531e, type: 3}
-    itemModel: {fileID: 1592870039195856, guid: aede543507b844402959e06f53605535,
+    itemDesc: Teletransporte
+    itemIcon: {fileID: 21300000, guid: 591674545e59ff14d88a38058af5ae99, type: 3}
+    itemModel: {fileID: 1927883817010500, guid: 5609514baf3d14aebad306133f6741c1,
       type: 2}
     itemValue: 1
     itemType: 2
     itemWeight: 0
-    maxStack: 1
+    maxStack: 10
     indexItemInList: 999
     rarity: 0
-    itemAttributes: []
-  - itemName: EscutDoble
+    itemAttributes:
+    - attributeName: Teletransporte
+      attributeValue: 10
+  - itemName: Rayo
     itemID: 5
     itemDesc: 
-    itemIcon: {fileID: 21300000, guid: d79a7cc261687e74d91d4b2488d76851, type: 3}
-    itemModel: {fileID: 1341298174010140, guid: 0f393de90047740519ef059d4a462e79,
-      type: 2}
-    itemValue: 1
-    itemType: 2
-    itemWeight: 0
-    maxStack: 1
-    indexItemInList: 999
-    rarity: 0
-    itemAttributes: []
-  - itemName: Iglu
-    itemID: 6
-    itemDesc: 
-    itemIcon: {fileID: 21300000, guid: 5bab3950eeef9c242999727a8b29b5cd, type: 3}
-    itemModel: {fileID: 1963228974943850, guid: 4df3a78ad0fd9416494aed20bbfba00a,
-      type: 2}
-    itemValue: 1
-    itemType: 2
-    itemWeight: 0
-    maxStack: 1
-    indexItemInList: 999
-    rarity: 0
-    itemAttributes: []
-  - itemName: New Item
-    itemID: 7
-    itemDesc: 
-    itemIcon: {fileID: 0}
+    itemIcon: {fileID: 21300000, guid: c291f37e310eecf4895f1229b891e404, type: 3}
     itemModel: {fileID: 0}
     itemValue: 1
     itemType: 0
     itemWeight: 0
-    maxStack: 1
+    maxStack: 10
     indexItemInList: 999
     rarity: 0
     itemAttributes: []
diff --git a/Unity/Assets/Plugins/InventoryMaster/Scripts/ExampleScript/PlayerInventory.cs b/Unity/Assets/Plugins/InventoryMaster/Scripts/ExampleScript/PlayerInventory.cs
@@ -18,11 +18,6 @@ public class PlayerInventory : MonoBehaviour
 
     public GameObject HPMANACanvas;
 
-    Text hpText;
-    Text manaText;
-    Image hpImage;
-    Image manaImage;
-
     float maxHealth = 100;
     float maxMana = 100;
     float maxDamage = 0;
@@ -32,9 +27,8 @@ public class PlayerInventory : MonoBehaviour
     float currentMana = 100;
     float currentDamage = 0;
     float currentArmor = 0;
-
+    
     int normalSize = 3;
-
     public void OnEnable()
     {
         Inventory.ItemEquip += OnBackpack;
@@ -157,18 +151,7 @@ void dropTheRestItems(int size)
 
     void Start()
     {
-        //if (HPMANACanvas != null)
-        //{
-        //    hpText = HPMANACanvas.transform.GetChild(1).GetChild(0).GetComponent<Text>();
-
-        //    manaText = HPMANACanvas.transform.GetChild(2).GetChild(0).GetComponent<Text>();
 
-        //    hpImage = HPMANACanvas.transform.GetChild(1).GetComponent<Image>();
-        //    manaImage = HPMANACanvas.transform.GetChild(1).GetComponent<Image>();
-
-        //    UpdateHPBar();
-        //    UpdateManaBar();
-        //}
 
         if (inputManagerDatabase == null)
             inputManagerDatabase = (InputManager)Resources.Load("InputManager");
@@ -185,24 +168,11 @@ void Start()
         if (craftSystem != null)
             craftSystemInventory = craftSystem.GetComponent<Inventory>();
     }
-
-    //void UpdateHPBar()
-    //{
-    //    hpText.text = (currentHealth + "/" + maxHealth);
-    //    float fillAmount = currentHealth / maxHealth;
-    //    hpImage.fillAmount = fillAmount;
-    //}
-
-    //void UpdateManaBar()
-    //{
-    //    manaText.text = (currentMana + "/" + maxMana);
-    //    float fillAmount = currentMana / maxMana;
-    //    manaImage.fillAmount = fillAmount;
-    //}
-
+
 
     public void OnConsumeItem(Item item)
     {
+
         for (int i = 0; i < item.itemAttributes.Count; i++)
         {
             if (item.itemAttributes[i].attributeName == "Health")

diff --git a/...ree/prefab/00_primitive/ErekiBall2.prefab → Unity/Assets/Resources/ErekiBall2.prefab b/...ree/prefab/00_primitive/ErekiBall2.prefab → Unity/Assets/Resources/ErekiBall2.prefab
diff --git a/...refab/00_primitive/ErekiBall2.prefab.meta → ...y/Assets/Resources/ErekiBall2.prefab.meta b/...refab/00_primitive/ErekiBall2.prefab.meta → ...y/Assets/Resources/ErekiBall2.prefab.meta
diff --git a/...onVFX/Prefabs/Fx_OilTrailHIGH_Root.prefab → ...ets/Resources/Fx_OilTrailHIGH_Root.prefab b/...onVFX/Prefabs/Fx_OilTrailHIGH_Root.prefab → ...ets/Resources/Fx_OilTrailHIGH_Root.prefab
diff --git a/.../Prefabs/Fx_OilTrailHIGH_Root.prefab.meta → ...esources/Fx_OilTrailHIGH_Root.prefab.meta b/.../Prefabs/Fx_OilTrailHIGH_Root.prefab.meta → ...esources/Fx_OilTrailHIGH_Root.prefab.meta
diff --git a/...icEffectsPackFree/prefab/GreenCore.prefab → Unity/Assets/Resources/GreenCore.prefab b/...icEffectsPackFree/prefab/GreenCore.prefab → Unity/Assets/Resources/GreenCore.prefab
diff --git a/...ectsPackFree/prefab/GreenCore.prefab.meta → Unity/Assets/Resources/GreenCore.prefab.meta b/...ectsPackFree/prefab/GreenCore.prefab.meta → Unity/Assets/Resources/GreenCore.prefab.meta
diff --git a/Unity/Assets/Resources/Meshes/TotemObjects/MedicalKit.prefab b/Unity/Assets/Resources/Meshes/TotemObjects/MedicalKit.prefab
@@ -66,7 +66,7 @@ Transform:
   m_GameObject: {fileID: 1406895379464410}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4051422816998840}
   m_Father: {fileID: 0}

diff --git a/Unity/Assets/Resources/Meshes/TotemObjects/Rocket.prefab b/Unity/Assets/Resources/Meshes/TotemObjects/Rocket.prefab
@@ -66,7 +66,7 @@ Transform:
   m_GameObject: {fileID: 1663579228098034}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 4501358405409998}
   m_Father: {fileID: 0}

diff --git a/Unity/Assets/Resources/Meshes/TotemObjects/TeleportBall.prefab b/Unity/Assets/Resources/Meshes/TotemObjects/TeleportBall.prefab
@@ -66,7 +66,7 @@ Transform:
   m_GameObject: {fileID: 1927883817010500}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
   m_Children:
   - {fileID: 4063006767109346}
   m_Father: {fileID: 0}

diff --git a/Unity/Assets/Resources/Meshes/TotemObjects/medicalKit.obj.meta b/Unity/Assets/Resources/Meshes/TotemObjects/medicalKit.obj.meta