Merge branch 'invUpdate'

2026-09-07 01:45:17 -05:00 · 2021-11-17 12:36:26 -06:00
parent e233d41b40 e2a1a9150c
commit 69a946c3ee
19 changed files with 132 additions and 46 deletions
--- a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 220c578e08133f54a95a442eb87b3702, type: 3}
+  m_Name: Blink
+  m_EditorClassIdentifier: 
+  id: 9
+  itemName: Blink
+  description: Allows Blinking forwards
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: 0
+  jumpNumM: 0
+  tractionM: 0
+  kickPowM: 0
+  recovTimeM: 0
+  playerGravM: 0
+  costM: 5
+  hasWallrunM: 0
+  hasBlinkM: 1
+  hasGrappleM: 0
+  hasGliderM: 0
+  hasNitroM: 0
+  hasDashM: 0
+  cooldownM: 5
--- a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset.meta
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3ec80a746c12614db0a11da845e3815
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 220c578e08133f54a95a442eb87b3702, type: 3}
+  m_Name: Nitro
+  m_EditorClassIdentifier: 
+  id: 10
+  itemName: Nitro
+  description: Boosts player speed
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: 0
+  jumpNumM: 0
+  tractionM: 0
+  kickPowM: 0
+  recovTimeM: 0
+  playerGravM: 0
+  costM: 6
+  hasWallrunM: 0
+  hasBlinkM: 0
+  hasGrappleM: 0
+  hasGliderM: 0
+  hasNitroM: 1
+  hasDashM: 0
+  cooldownM: 5
--- a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset.meta
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b91f668477f6b3244b3fea3204e6cd87
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: