Merge branch 'release/Sprint_5'

EnginyeriaSofwareUB · Dec 18, 2017 · 38ec765 · 38ec765
2 parents dc06f13 + 72acd97
commit 38ec765
Show file tree

Hide file tree

Showing 87 changed files with 5,239 additions and 1,864 deletions.
diff --git a/Unity/Assets/Plugins/InventoryMaster/Resources/ItemDatabase.asset b/Unity/Assets/Plugins/InventoryMaster/Resources/ItemDatabase.asset
@@ -160,3 +160,55 @@ MonoBehaviour:
     itemAttributes:
     - attributeName: EscutDoble
       attributeValue: 0
+  - itemName: Bomb
+    itemID: 10
+    itemDesc: 
+    itemIcon: {fileID: 21300000, guid: ea57ca5fab0beeb40bac1d3b97957234, type: 3}
+    itemModel: {fileID: 1709465905319060, guid: 81962b8f14c0f42328f05de40c0ce365,
+      type: 2}
+    itemValue: 1
+    itemType: 1
+    itemWeight: 0
+    maxStack: 1
+    indexItemInList: 999
+    rarity: 0
+    itemAttributes: []
+  - itemName: Semtex
+    itemID: 11
+    itemDesc: 
+    itemIcon: {fileID: 21300000, guid: 26cb4c780e2d19147aff0ae992442330, type: 3}
+    itemModel: {fileID: 1412795882170356, guid: f931ef75cff4f438bb83abb70b14dfe2,
+      type: 2}
+    itemValue: 1
+    itemType: 0
+    itemWeight: 0
+    maxStack: 1
+    indexItemInList: 999
+    rarity: 0
+    itemAttributes: []
+  - itemName: Missile
+    itemID: 12
+    itemDesc: 
+    itemIcon: {fileID: 21300000, guid: ee3618f447dc5c14cade2d9408c58278, type: 3}
+    itemModel: {fileID: 1542998702696622, guid: 44711fb04b1e140b0ba0049047de9f28,
+      type: 2}
+    itemValue: 1
+    itemType: 0
+    itemWeight: 0
+    maxStack: 1
+    indexItemInList: 999
+    rarity: 0
+    itemAttributes: []
+  - itemName: Grenade
+    itemID: 13
+    itemDesc: 
+    itemIcon: {fileID: 21300000, guid: d1fed81c8effd3d4780f4e843de79db9, type: 3}
+    itemModel: {fileID: 1645971520566788, guid: 05a167fc140064621bb3af25e6ef4788,
+      type: 2}
+    itemValue: 1
+    itemType: 0
+    itemWeight: 0
+    maxStack: 1
+    indexItemInList: 999
+    rarity: 0
+    itemAttributes: []
diff --git a/Unity/Assets/Plugins/InventoryMaster/Scripts/Inventory/CloseInventory.cs b/Unity/Assets/Plugins/InventoryMaster/Scripts/Inventory/CloseInventory.cs
@@ -7,6 +7,7 @@ public class CloseInventory : MonoBehaviour, IPointerDownHandler
 {
 
     Inventory inv;
+
     void Start()
     {
         inv = transform.parent.GetComponent<Inventory>();
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         Inventory inv;
         void Start()
         {
             inv = transform.parent.GetComponent<Inventory>();
@@ Expand Down @@