mirror of
https://github.com/Leahnaya/TheKingsRace.git
synced 2026-04-26 02:00:54 -05:00
Merge branch 'main' into UI-Prototypes
This commit is contained in:
commit
576f5aafdf
1453
Assets/Scenes/Demos/MovementScene.unity
Normal file
1453
Assets/Scenes/Demos/MovementScene.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/Demos/MovementScene.unity.meta
Normal file
7
Assets/Scenes/Demos/MovementScene.unity.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4282c79fedd3def4fa3c93c0a77f914f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Scripts/PlayerScripts/ItemScripts.meta
Normal file
8
Assets/Scripts/PlayerScripts/ItemScripts.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7c3b0fb28afc8e04c8324830d2bbcc2f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class InventoryManager : MonoBehaviour
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 66519fc5420181e45850c591aa1179ec
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
51
Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
Normal file
51
Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
[CreateAssetMenu]
|
||||
public class Item: ScriptableObject {
|
||||
public int id;
|
||||
public string itemName;
|
||||
public string description;
|
||||
[Space]
|
||||
public float maxVelM;
|
||||
public float minVelM;
|
||||
public float curVelM;
|
||||
public float accM;
|
||||
public float jumpPowM;
|
||||
public int jumpNumM;
|
||||
public float tractionM;
|
||||
public float kickPowM;
|
||||
public float recovTimeM;
|
||||
public float playerGravM;
|
||||
|
||||
public void Equip(PlayerStats p){
|
||||
if(maxVelM != 0){
|
||||
p.MaxVel += maxVelM;
|
||||
}
|
||||
if(minVelM != 0){
|
||||
p.MinVel += minVelM;
|
||||
}
|
||||
if(curVelM != 0){
|
||||
p.CurVel += curVelM;
|
||||
}
|
||||
if(accM != 0){
|
||||
p.Acc += accM;
|
||||
}
|
||||
if(jumpPowM != 0){
|
||||
p.JumpPow += jumpPowM;
|
||||
}
|
||||
if(jumpNumM != 0){
|
||||
p.JumpNum += jumpNumM;
|
||||
}
|
||||
if(tractionM != 0){
|
||||
p.Traction += tractionM;
|
||||
}
|
||||
if(kickPowM != 0){
|
||||
p.KickPow += kickPowM;
|
||||
}
|
||||
if(playerGravM != 0){
|
||||
p.PlayerGrav += playerGravM;
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
Normal file
11
Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d76cac0a7f5ea2a4cadbec8ef3315ec1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e292b284ab595e24684a1ed7e69c6a2d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
%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: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
|
||||
m_Name: QuickStandup
|
||||
m_EditorClassIdentifier:
|
||||
id: 4
|
||||
itemName: QuickStandup
|
||||
description: Player gets up faster
|
||||
maxVelM: 0
|
||||
minVelM: 0
|
||||
curVelM: 0
|
||||
accM: 0
|
||||
jumpPowM: 0
|
||||
jumpNumM: 0
|
||||
tractionM: 0
|
||||
kickPowM: 0
|
||||
recovTimeM: 20
|
||||
playerGravM: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a4f559eb10aa9b243a2a08c544802857
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
%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: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
|
||||
m_Name: RollerSkates
|
||||
m_EditorClassIdentifier:
|
||||
id: 1
|
||||
itemName: RollerSkates
|
||||
description: More Slidey But Faster
|
||||
maxVelM: 15
|
||||
minVelM: 0
|
||||
curVelM: 0
|
||||
accM: 0.3
|
||||
jumpPowM: 0
|
||||
jumpNumM: 0
|
||||
tractionM: -2.2
|
||||
kickPowM: 0
|
||||
recovTimeM: 0
|
||||
playerGravM: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c6fce7543828d16448383a9e0c1d651d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
%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: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
|
||||
m_Name: Springs
|
||||
m_EditorClassIdentifier:
|
||||
id: 2
|
||||
itemName: Springs
|
||||
description: Jump Higher
|
||||
maxVelM: 0
|
||||
minVelM: 0
|
||||
curVelM: 0
|
||||
accM: 0
|
||||
jumpPowM: 100
|
||||
jumpNumM: 0
|
||||
tractionM: 0
|
||||
kickPowM: 0
|
||||
recovTimeM: 0
|
||||
playerGravM: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ca4d5584eacf416478beba5cd283bfa3
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
%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: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
|
||||
m_Name: StrongerKick
|
||||
m_EditorClassIdentifier:
|
||||
id: 0
|
||||
itemName:
|
||||
description:
|
||||
maxVelM: 0
|
||||
minVelM: 0
|
||||
curVelM: 0
|
||||
accM: 0
|
||||
jumpPowM: 0
|
||||
jumpNumM: 0
|
||||
tractionM: 0
|
||||
kickPowM: 30
|
||||
recovTimeM: 0
|
||||
playerGravM: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a96dfb1a70e0d0a4f84c15378f38ce99
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
%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: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
|
||||
m_Name: TripleJump
|
||||
m_EditorClassIdentifier:
|
||||
id: 3
|
||||
itemName: TripleJump
|
||||
description: Player gets an extra jump but has less jump height
|
||||
maxVelM: 0
|
||||
minVelM: 0
|
||||
curVelM: 0
|
||||
accM: 0
|
||||
jumpPowM: -50
|
||||
jumpNumM: 1
|
||||
tractionM: 0
|
||||
kickPowM: 0
|
||||
recovTimeM: 0
|
||||
playerGravM: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6a839da810e4bd746bb2a72d791cb8a4
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
7
Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
Normal file
7
Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class SpecialItem : Item
|
||||
{
|
||||
}
|
||||
11
Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta
Normal file
11
Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 220c578e08133f54a95a442eb87b3702
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue
Block a user