Added controls for gamepad, changed input & UI
This commit is contained in:
TAASONI3
parent
0b058f9248
commit
7aba856b17
101
Assets/IMG/Animations/Slime.controller
Normal file
101
Assets/IMG/Animations/Slime.controller
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1102 &-6855145815201051956
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: SlimeShake
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 7400000, guid: ede74c56a26b584d3a2c8879ca304ca5, type: 2}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!91 &9100000
|
||||||
|
AnimatorController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Slime
|
||||||
|
serializedVersion: 5
|
||||||
|
m_AnimatorParameters: []
|
||||||
|
m_AnimatorLayers:
|
||||||
|
- serializedVersion: 5
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_StateMachine: {fileID: 1054231817466275165}
|
||||||
|
m_Mask: {fileID: 0}
|
||||||
|
m_Motions: []
|
||||||
|
m_Behaviours: []
|
||||||
|
m_BlendingMode: 0
|
||||||
|
m_SyncedLayerIndex: -1
|
||||||
|
m_DefaultWeight: 0
|
||||||
|
m_IKPass: 0
|
||||||
|
m_SyncedLayerAffectsTiming: 0
|
||||||
|
m_Controller: {fileID: 9100000}
|
||||||
|
--- !u!1107 &1054231817466275165
|
||||||
|
AnimatorStateMachine:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_ChildStates:
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 8150922779072304225}
|
||||||
|
m_Position: {x: 420, y: 110, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -6855145815201051956}
|
||||||
|
m_Position: {x: 400, y: 300, z: 0}
|
||||||
|
m_ChildStateMachines: []
|
||||||
|
m_AnyStateTransitions: []
|
||||||
|
m_EntryTransitions: []
|
||||||
|
m_StateMachineTransitions: {}
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||||
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||||
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||||
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
|
m_DefaultState: {fileID: 8150922779072304225}
|
||||||
|
--- !u!1102 &8150922779072304225
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: SlimeIdle
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 0}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
8
Assets/IMG/Animations/Slime.controller.meta
Normal file
8
Assets/IMG/Animations/Slime.controller.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4ba80d637a150ea56a6cdaefe6131cbc
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 9100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
53
Assets/IMG/Animations/SlimeIdle.anim
Normal file
53
Assets/IMG/Animations/SlimeIdle.anim
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!74 &7400000
|
||||||
|
AnimationClip:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: SlimeIdle
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Legacy: 0
|
||||||
|
m_Compressed: 0
|
||||||
|
m_UseHighQualityCurve: 1
|
||||||
|
m_RotationCurves: []
|
||||||
|
m_CompressedRotationCurves: []
|
||||||
|
m_EulerCurves: []
|
||||||
|
m_PositionCurves: []
|
||||||
|
m_ScaleCurves: []
|
||||||
|
m_FloatCurves: []
|
||||||
|
m_PPtrCurves: []
|
||||||
|
m_SampleRate: 60
|
||||||
|
m_WrapMode: 0
|
||||||
|
m_Bounds:
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
|
m_ClipBindingConstant:
|
||||||
|
genericBindings: []
|
||||||
|
pptrCurveMapping: []
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 1
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
m_LoopBlend: 0
|
||||||
|
m_LoopBlendOrientation: 0
|
||||||
|
m_LoopBlendPositionY: 0
|
||||||
|
m_LoopBlendPositionXZ: 0
|
||||||
|
m_KeepOriginalOrientation: 0
|
||||||
|
m_KeepOriginalPositionY: 1
|
||||||
|
m_KeepOriginalPositionXZ: 0
|
||||||
|
m_HeightFromFeet: 0
|
||||||
|
m_Mirror: 0
|
||||||
|
m_EditorCurves: []
|
||||||
|
m_EulerEditorCurves: []
|
||||||
|
m_HasGenericRootTransform: 0
|
||||||
|
m_HasMotionFloatCurves: 0
|
||||||
|
m_Events: []
|
||||||
8
Assets/IMG/Animations/SlimeIdle.anim.meta
Normal file
8
Assets/IMG/Animations/SlimeIdle.anim.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c31e8b0cb0ec91badbc362264f31f935
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
307
Assets/IMG/Animations/SlimeShake.anim
Normal file
307
Assets/IMG/Animations/SlimeShake.anim
Normal file
@ -0,0 +1,307 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!74 &7400000
|
||||||
|
AnimationClip:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: SlimeShake
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Legacy: 0
|
||||||
|
m_Compressed: 0
|
||||||
|
m_UseHighQualityCurve: 1
|
||||||
|
m_RotationCurves: []
|
||||||
|
m_CompressedRotationCurves: []
|
||||||
|
m_EulerCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: {x: 0, y: 0, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.033333335
|
||||||
|
value: {x: 0, y: 0, z: 5}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.06666667
|
||||||
|
value: {x: 0, y: 0, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: -150.00002}
|
||||||
|
outSlope: {x: 0, y: 0, z: -150.00002}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.1
|
||||||
|
value: {x: 0, y: 0, z: -5}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.13333334
|
||||||
|
value: {x: 0, y: 0, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
path:
|
||||||
|
m_PositionCurves: []
|
||||||
|
m_ScaleCurves: []
|
||||||
|
m_FloatCurves: []
|
||||||
|
m_PPtrCurves: []
|
||||||
|
m_SampleRate: 60
|
||||||
|
m_WrapMode: 0
|
||||||
|
m_Bounds:
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
|
m_ClipBindingConstant:
|
||||||
|
genericBindings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 0
|
||||||
|
attribute: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 4
|
||||||
|
customType: 4
|
||||||
|
isPPtrCurve: 0
|
||||||
|
pptrCurveMapping: []
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 0.13333334
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
m_LoopBlend: 0
|
||||||
|
m_LoopBlendOrientation: 0
|
||||||
|
m_LoopBlendPositionY: 0
|
||||||
|
m_LoopBlendPositionXZ: 0
|
||||||
|
m_KeepOriginalOrientation: 0
|
||||||
|
m_KeepOriginalPositionY: 1
|
||||||
|
m_KeepOriginalPositionXZ: 0
|
||||||
|
m_HeightFromFeet: 0
|
||||||
|
m_Mirror: 0
|
||||||
|
m_EditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.033333335
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.06666667
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.13333334
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.033333335
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.06666667
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.13333334
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.033333335
|
||||||
|
value: 5
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.06666667
|
||||||
|
value: 0
|
||||||
|
inSlope: -150.00002
|
||||||
|
outSlope: -150.00002
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.1
|
||||||
|
value: -5
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.13333334
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_EulerEditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_HasGenericRootTransform: 1
|
||||||
|
m_HasMotionFloatCurves: 0
|
||||||
|
m_Events: []
|
||||||
8
Assets/IMG/Animations/SlimeShake.anim.meta
Normal file
8
Assets/IMG/Animations/SlimeShake.anim.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ede74c56a26b584d3a2c8879ca304ca5
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/IMG/Aseprite/MenuStyling.aseprite
Normal file
BIN
Assets/IMG/Aseprite/MenuStyling.aseprite
Normal file
Binary file not shown.
7
Assets/IMG/Aseprite/MenuStyling.aseprite.meta
Normal file
7
Assets/IMG/Aseprite/MenuStyling.aseprite.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bc1732b9bb81fa8788cfc4449be0be60
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/IMG/MenuStyling.png
Normal file
BIN
Assets/IMG/MenuStyling.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 619 B |
123
Assets/IMG/MenuStyling.png.meta
Normal file
123
Assets/IMG/MenuStyling.png.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 68a86c685203ca684843725af1877ebf
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
846
Assets/Input.inputactions
Normal file
846
Assets/Input.inputactions
Normal file
@ -0,0 +1,846 @@
|
|||||||
|
{
|
||||||
|
"name": "Input",
|
||||||
|
"maps": [
|
||||||
|
{
|
||||||
|
"name": "Menu",
|
||||||
|
"id": "b9ea94f5-de8b-40ea-b099-4aee58784866",
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"name": "Movement",
|
||||||
|
"type": "Value",
|
||||||
|
"id": "d36a79bc-d0ab-45f9-bfe1-4461d720ced1",
|
||||||
|
"expectedControlType": "Stick",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Select",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "f5d4b87c-d3a2-46c3-8359-1200837b9488",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "c829ac0c-1407-4b34-9de6-b3dc80faa27c",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillOne",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "7f5add79-932e-49aa-b2b0-91a7222e844d",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillTwo",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "d90ae832-468d-49ee-ac78-3f720aac9d91",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillThree",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "3bf27bbc-2553-4c56-90ce-089ec3985f34",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillFour",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "e5019b66-a0ae-4778-8afa-6272917330af",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillFive",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "c77fc299-2907-414d-9dcd-ce25527fb09a",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "SkillSix",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "92be85ab-a708-4a61-8d71-19a0f4e1a3a4",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Charsheet",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "772a3f30-c5b5-4782-9d08-9fcfb6e45902",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Inventory",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "6f41ca97-ac56-4d15-831b-5d1ee56fc561",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Questlog",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "89f16da1-10b9-4d1c-9437-70dd3c0e4d54",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Pause",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "24eaf9a7-426f-48ca-a870-20b209478a2b",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"bindings": [
|
||||||
|
{
|
||||||
|
"name": "2D Vector",
|
||||||
|
"id": "2d4968ad-f128-4410-9ca1-7c0b003b76cb",
|
||||||
|
"path": "2DVector",
|
||||||
|
"interactions": "Press(behavior=1)",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": true,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "up",
|
||||||
|
"id": "20d0d2d3-d8ef-49d4-8d6c-909317b3c7c3",
|
||||||
|
"path": "<Gamepad>/leftStick/up",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "down",
|
||||||
|
"id": "696e37ef-8c72-493c-b940-d77689e44fb7",
|
||||||
|
"path": "<Gamepad>/leftStick/down",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "left",
|
||||||
|
"id": "e962ed26-9e34-4f28-b38b-78833722d55d",
|
||||||
|
"path": "<Gamepad>/leftStick/left",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "right",
|
||||||
|
"id": "322e1c16-7446-40cc-abc1-a1dda7977e7f",
|
||||||
|
"path": "<Gamepad>/leftStick/right",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "d8c9e3c1-1205-4af0-8e6c-8759b8a18d3a",
|
||||||
|
"path": "<Gamepad>/buttonSouth",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Select",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "1e2ff324-8527-4542-b614-dd4740cbbc92",
|
||||||
|
"path": "<Gamepad>/buttonEast",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Back",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "08a674f1-0352-45b5-89a1-d170b7365868",
|
||||||
|
"path": "<Keyboard>/numpad1",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillOne",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "ce83c276-23d5-4bf8-95c6-83b965316374",
|
||||||
|
"path": "<Keyboard>/1",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillOne",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "246a212b-b4c9-4210-983c-a437ba218b06",
|
||||||
|
"path": "<Keyboard>/numpad2",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillTwo",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "bfeadf2f-95c4-4955-b9d4-e341f9715522",
|
||||||
|
"path": "<Keyboard>/2",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillTwo",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "d21c4d66-bc17-4c89-b517-5b330fbd03a8",
|
||||||
|
"path": "<Keyboard>/3",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillThree",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "6a4d70e0-2075-4ea1-bca3-f0babec2d599",
|
||||||
|
"path": "<Keyboard>/numpad3",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillThree",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "65a59c0c-4728-4a4b-a138-b254edd5f96c",
|
||||||
|
"path": "<Keyboard>/numpad4",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillFour",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "b37ea1f3-42b2-44d8-b833-336b290953f5",
|
||||||
|
"path": "<Keyboard>/4",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillFour",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "321d6efa-a26f-468f-8cb1-0aa3cdc61c7e",
|
||||||
|
"path": "<Keyboard>/5",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillFive",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "dbf5a389-2019-4a1e-9180-079f9d6e469e",
|
||||||
|
"path": "<Keyboard>/numpad5",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillFive",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "588a56fd-8885-4742-823a-916f42d7639f",
|
||||||
|
"path": "<Keyboard>/6",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillSix",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "c4b935de-8b10-4544-b50a-08e1472c8fe9",
|
||||||
|
"path": "<Keyboard>/numpad6",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "SkillSix",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "44c2c619-f0b6-42c4-9f6e-d5be7cc9bd2a",
|
||||||
|
"path": "<Keyboard>/c",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Charsheet",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "2d20ea2e-d6fb-4c55-9f20-da09821adcfa",
|
||||||
|
"path": "<Keyboard>/i",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Inventory",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "0866f5f0-431c-4019-b23d-d829500d5dce",
|
||||||
|
"path": "<Keyboard>/q",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Questlog",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "d548504c-b1de-4505-a23b-2503dcf6f23e",
|
||||||
|
"path": "<Keyboard>/escape",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Pause",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "MainGame",
|
||||||
|
"id": "712b45f3-3199-497f-85da-3436b9aca739",
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"name": "Movement",
|
||||||
|
"type": "Value",
|
||||||
|
"id": "e90d9193-4b2b-4a86-bf69-ad1d4865b7e8",
|
||||||
|
"expectedControlType": "Stick",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Interaction",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "b5f3621c-6eae-4a0a-87a4-d8569eab05d5",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Charsheet",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "c46c052d-0d2e-483f-949b-d2a96f72c7f1",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Inventory",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "d59063bc-b8f8-4043-bdec-4ee5b98ce30b",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Questlog",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "4fb1c089-6959-467a-84d3-cf02a011f607",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Pause",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "eac9bc5a-fff1-426b-9fee-e97b395b6c9d",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Looking",
|
||||||
|
"type": "Value",
|
||||||
|
"id": "b496d522-f184-4b23-9fd5-c3bddf1d8299",
|
||||||
|
"expectedControlType": "Stick",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"bindings": [
|
||||||
|
{
|
||||||
|
"name": "3D Vector",
|
||||||
|
"id": "5333996c-65b0-4469-a70f-2a09a91091db",
|
||||||
|
"path": "3DVector(mode=1)",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": true,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "up",
|
||||||
|
"id": "81717563-c233-411f-bf17-bf53ced54dd9",
|
||||||
|
"path": "<Keyboard>/space",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "down",
|
||||||
|
"id": "bcf031ee-ea36-472b-af82-47241eebd844",
|
||||||
|
"path": "",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "left",
|
||||||
|
"id": "cd4b43b0-036f-4e54-8154-002e765c7259",
|
||||||
|
"path": "<Keyboard>/a",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "right",
|
||||||
|
"id": "67bff71f-ce6a-430a-b68e-d4a52f2e48f0",
|
||||||
|
"path": "<Keyboard>/d",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "forward",
|
||||||
|
"id": "6c4440e2-099b-4260-aa44-166f0c35d080",
|
||||||
|
"path": "<Keyboard>/w",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "backward",
|
||||||
|
"id": "60cedbbc-e596-4c6d-b60e-a953e62c460d",
|
||||||
|
"path": "<Keyboard>/s",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "3D Vector",
|
||||||
|
"id": "c5cf6e46-b489-4ff7-bf1b-4cd8bdc80e4f",
|
||||||
|
"path": "3DVector",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": true,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "up",
|
||||||
|
"id": "df821494-d2f9-424a-9408-be6e1fa30f03",
|
||||||
|
"path": "<Gamepad>/buttonSouth",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "left",
|
||||||
|
"id": "09782a67-372e-41a2-b884-5482589fe6a6",
|
||||||
|
"path": "<Gamepad>/leftStick/left",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "right",
|
||||||
|
"id": "3a694ab9-4380-4e28-8d4e-f20ba1f40dba",
|
||||||
|
"path": "<Gamepad>/leftStick/right",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "forward",
|
||||||
|
"id": "f8ac0576-82df-4735-8b58-2ac9eb1a9fbf",
|
||||||
|
"path": "<Gamepad>/leftStick/up",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "backward",
|
||||||
|
"id": "47b850c7-8cf0-47fc-8e6a-b0cb81f2d44e",
|
||||||
|
"path": "<Gamepad>/leftStick/down",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Movement",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "dc31e776-058a-450c-b759-e20abbfb62f0",
|
||||||
|
"path": "<Keyboard>/e",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Interaction",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "6206e2a6-91d8-4bbc-9b78-f47f89648d46",
|
||||||
|
"path": "<Gamepad>/buttonEast",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Interaction",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "9f93a5f5-6762-48a6-8747-ee04a1833148",
|
||||||
|
"path": "<Keyboard>/c",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Charsheet",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "af6d7d0a-ffde-4a66-a749-011dd678189b",
|
||||||
|
"path": "<Gamepad>/buttonNorth",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Charsheet",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "3876ad34-0e23-4436-bd5f-84c8411dee1a",
|
||||||
|
"path": "<Keyboard>/i",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Inventory",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "334a7d9e-da06-4a7e-8f0f-fe3a95611d67",
|
||||||
|
"path": "<Gamepad>/buttonWest",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Inventory",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "60d2c138-97f6-4ac1-b13a-a48995ae8642",
|
||||||
|
"path": "<Keyboard>/q",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Questlog",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "9d591b31-ce52-4d56-b14f-484cfbba467a",
|
||||||
|
"path": "<Gamepad>/select",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Questlog",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "ae77bfef-c262-47b7-82a1-e2108c417ced",
|
||||||
|
"path": "<Keyboard>/escape",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Pause",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "de90f611-adfa-45ba-a41b-9c286d59b95c",
|
||||||
|
"path": "<Gamepad>/start",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Pause",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "2D Vector",
|
||||||
|
"id": "b54eb01e-500c-494e-a2ac-bbce47e8ad87",
|
||||||
|
"path": "2DVector",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": true,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "up",
|
||||||
|
"id": "ddc578d6-bc10-428f-9df3-4b8c2f6df074",
|
||||||
|
"path": "<Mouse>/delta/up",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "down",
|
||||||
|
"id": "cb3bcc0f-1835-4e76-aef9-d9c4207d5b33",
|
||||||
|
"path": "<Mouse>/delta/down",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "left",
|
||||||
|
"id": "02f9a2f5-653b-4386-a5ed-170470e4a4ed",
|
||||||
|
"path": "<Mouse>/delta/left",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "right",
|
||||||
|
"id": "3faa6ef9-15da-4053-b3e1-50800560bd51",
|
||||||
|
"path": "<Mouse>/delta/right",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "KeyboardMouse",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "2D Vector",
|
||||||
|
"id": "2d5b50ae-14cb-4341-833d-f5b4aa6d5ca8",
|
||||||
|
"path": "2DVector(mode=2)",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": true,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "up",
|
||||||
|
"id": "a1a023fe-9bf5-4840-a79c-a2d846a70b70",
|
||||||
|
"path": "<Gamepad>/rightStick/up",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "down",
|
||||||
|
"id": "407b59a1-c2fa-4f50-a971-38caceeed23f",
|
||||||
|
"path": "<Gamepad>/rightStick/down",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "left",
|
||||||
|
"id": "a51aab17-73a4-48aa-95a0-c8030f392838",
|
||||||
|
"path": "<Gamepad>/rightStick/left",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "right",
|
||||||
|
"id": "7d475dc9-67fd-477c-97f4-0f6938bedc61",
|
||||||
|
"path": "<Gamepad>/rightStick/right",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Controller",
|
||||||
|
"action": "Looking",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"controlSchemes": [
|
||||||
|
{
|
||||||
|
"name": "KeyboardMouse",
|
||||||
|
"bindingGroup": "KeyboardMouse",
|
||||||
|
"devices": [
|
||||||
|
{
|
||||||
|
"devicePath": "<Keyboard>",
|
||||||
|
"isOptional": false,
|
||||||
|
"isOR": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"devicePath": "<Mouse>",
|
||||||
|
"isOptional": false,
|
||||||
|
"isOR": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Controller",
|
||||||
|
"bindingGroup": "Controller",
|
||||||
|
"devices": [
|
||||||
|
{
|
||||||
|
"devicePath": "<Gamepad>",
|
||||||
|
"isOptional": false,
|
||||||
|
"isOR": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
14
Assets/Input.inputactions.meta
Normal file
14
Assets/Input.inputactions.meta
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cc5f5ab97010425e291f8fdc095f3718
|
||||||
|
ScriptedImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
|
||||||
|
generateWrapperCode: 0
|
||||||
|
wrapperCodePath:
|
||||||
|
wrapperClassName:
|
||||||
|
wrapperCodeNamespace:
|
||||||
314
Assets/Prefabs/Card.prefab
Normal file
314
Assets/Prefabs/Card.prefab
Normal file
@ -0,0 +1,314 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &1170199013192819332
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5089374610631651373}
|
||||||
|
- component: {fileID: 1792228810911075782}
|
||||||
|
- component: {fileID: 5820235995421586912}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: KP
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5089374610631651373
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1170199013192819332}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2063041626556465198}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 0.1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1792228810911075782
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1170199013192819332}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &5820235995421586912
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1170199013192819332}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_FontSize: 40
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 4
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: KP
|
||||||
|
--- !u!1 &3121921968277587460
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3839194029174631876}
|
||||||
|
- component: {fileID: 6735304227373951631}
|
||||||
|
- component: {fileID: 9183992444230739295}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: HP
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3839194029174631876
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3121921968277587460}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2063041626556465198}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6735304227373951631
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3121921968277587460}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &9183992444230739295
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3121921968277587460}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_FontSize: 40
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 4
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: HP
|
||||||
|
--- !u!1 &3137928048350964682
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 975834127953310456}
|
||||||
|
- component: {fileID: 6259346854149076006}
|
||||||
|
- component: {fileID: 4363396730402359470}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &975834127953310456
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3137928048350964682}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2063041626556465198}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0.1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6259346854149076006
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3137928048350964682}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &4363396730402359470
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3137928048350964682}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Texture: {fileID: 2800000, guid: 44b6c5089e7d73341a8765e781c61416, type: 3}
|
||||||
|
m_UVRect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 1
|
||||||
|
height: 1
|
||||||
|
--- !u!1 &4498463701313354429
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2063041626556465198}
|
||||||
|
- component: {fileID: 1982862871796128281}
|
||||||
|
- component: {fileID: 2352439822827733188}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Card
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2063041626556465198
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4498463701313354429}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 975834127953310456}
|
||||||
|
- {fileID: 5089374610631651373}
|
||||||
|
- {fileID: 3839194029174631876}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 400, y: 600}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1982862871796128281
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4498463701313354429}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &2352439822827733188
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4498463701313354429}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_Type: 1
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
7
Assets/Prefabs/Card.prefab.meta
Normal file
7
Assets/Prefabs/Card.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ae1dcf4495c5bfd908a9dae9ecc89ae0
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
192
Assets/Prefabs/newSlot.prefab
Normal file
192
Assets/Prefabs/newSlot.prefab
Normal file
@ -0,0 +1,192 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &7287345907462116809
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3948338302074099163}
|
||||||
|
- component: {fileID: 6281336247825305208}
|
||||||
|
- component: {fileID: 6848317083609613261}
|
||||||
|
- component: {fileID: 6141205227167828802}
|
||||||
|
- component: {fileID: 3847962230600515313}
|
||||||
|
- component: {fileID: 1023590545195096446}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: newSlot
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3948338302074099163
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6281336247825305208
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &6848317083609613261
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 4
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 6141205227167828802}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1023590545195096446}
|
||||||
|
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
|
||||||
|
m_MethodName: showSlotOptions
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &6141205227167828802
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_UVRect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 1
|
||||||
|
height: 1
|
||||||
|
--- !u!114 &3847962230600515313
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Delegates:
|
||||||
|
- eventID: 0
|
||||||
|
callback:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1023590545195096446}
|
||||||
|
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
|
||||||
|
m_MethodName: showTooltip
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
- eventID: 1
|
||||||
|
callback:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1023590545195096446}
|
||||||
|
m_TargetAssemblyTypeName: Assets.Scripts.InventorySlot, Assembly-CSharp
|
||||||
|
m_MethodName: hideTooltip
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1023590545195096446
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7287345907462116809}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b661b52d4ccd19649bb6a1a5f1d9b893, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
place: 0
|
||||||
7
Assets/Prefabs/newSlot.prefab.meta
Normal file
7
Assets/Prefabs/newSlot.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 782a647126384df6d91a2f4be5c2cd39
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -30,6 +30,7 @@ RectTransform:
|
|||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
@ -86,7 +87,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: b661b52d4ccd19649bb6a1a5f1d9b893, type: 3}
|
m_Script: {fileID: 11500000, guid: b661b52d4ccd19649bb6a1a5f1d9b893, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
itemRemoved: 000000
|
|
||||||
place: 8
|
place: 8
|
||||||
--- !u!114 &206628748623723557
|
--- !u!114 &206628748623723557
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -3,6 +3,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class Controls : MonoBehaviour
|
public class Controls : MonoBehaviour
|
||||||
@ -13,6 +14,11 @@ public class Controls : MonoBehaviour
|
|||||||
GameObject playerCam;
|
GameObject playerCam;
|
||||||
UIHandler uihandler;
|
UIHandler uihandler;
|
||||||
GameObject currentHouse;
|
GameObject currentHouse;
|
||||||
|
Vector3 input;
|
||||||
|
Vector2 view;
|
||||||
|
PlayerInput playerInput;
|
||||||
|
MoveDirection direction;
|
||||||
|
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
@ -21,122 +27,185 @@ public class Controls : MonoBehaviour
|
|||||||
worldGen = GameObject.Find("WorldGenerator");
|
worldGen = GameObject.Find("WorldGenerator");
|
||||||
playerCam = GameObject.Find("Main Camera");
|
playerCam = GameObject.Find("Main Camera");
|
||||||
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
|
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
|
||||||
|
input = new Vector3();
|
||||||
|
view = new Vector2();
|
||||||
|
playerInput = GetComponent<PlayerInput>();
|
||||||
|
direction = MoveDirection.None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
if(playerInput.currentControlScheme == "Controller"){
|
||||||
|
if(Cursor.lockState != CursorLockMode.Locked){
|
||||||
|
Cursor.lockState = CursorLockMode.Locked;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(uihandler.canPlayerRotate()){
|
||||||
|
Cursor.lockState = CursorLockMode.Locked;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
Cursor.lockState = CursorLockMode.Confined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(uihandler.state == UIState.GAME && playerInput.currentActionMap.name != "MainGame"){
|
||||||
|
playerInput.SwitchCurrentActionMap("MainGame");
|
||||||
|
}
|
||||||
|
if(uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu"){
|
||||||
|
playerInput.SwitchCurrentActionMap("Menu");
|
||||||
|
}
|
||||||
if (!player.GetComponent<Player>().takeDamage(0))
|
if (!player.GetComponent<Player>().takeDamage(0))
|
||||||
{
|
{
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
if (!uihandler.isPlayerInFight())
|
if (!uihandler.isPlayerInFight())
|
||||||
{
|
{
|
||||||
checkNormalControls();
|
if (uihandler.canPlayerRotate()){
|
||||||
}
|
playerCam.GetComponent<PlayerCamera>().lookAround(view, playerInput.currentControlScheme == "Controller");
|
||||||
else
|
}
|
||||||
{
|
|
||||||
checkFightControls();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkNormalControls()
|
public void FixedUpdate(){
|
||||||
{
|
if (!player.GetComponent<Player>().takeDamage(0))
|
||||||
if (uihandler.canPlayerMove())
|
|
||||||
{
|
{
|
||||||
player.GetComponent<Player>().move();
|
if (!uihandler.isPlayerInFight())
|
||||||
if (Input.GetKeyDown(KeyCode.E))
|
|
||||||
{
|
{
|
||||||
GameObject target = playerCam.GetComponent<PlayerCamera>().interactWithObject();
|
if (uihandler.canPlayerMove())
|
||||||
if (target != null)
|
|
||||||
{
|
{
|
||||||
switch (target.tag.Split(':')[1])
|
player.GetComponent<Player>().move(input);
|
||||||
{
|
|
||||||
case "Enemy":
|
|
||||||
fight.GetComponent<Fight>().startFight(worldGen.GetComponent<WorldGenerator>().getCurrentTile(), target, player);
|
|
||||||
break;
|
|
||||||
case "Tree":
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Wood"));
|
|
||||||
Destroy(target);
|
|
||||||
break;
|
|
||||||
case "Stone":
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Rock"));
|
|
||||||
Destroy(target);
|
|
||||||
break;
|
|
||||||
case "NPC":
|
|
||||||
target.GetComponent<NPC>().interact();
|
|
||||||
break;
|
|
||||||
case "Door":
|
|
||||||
target.GetComponent<Door>().interact();
|
|
||||||
break;
|
|
||||||
case "Chest":
|
|
||||||
target.GetComponent<Chest>().interact();
|
|
||||||
break;
|
|
||||||
case "Ore":
|
|
||||||
if(target.name.ToLower().Contains("iron")){
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Iron ore"));
|
|
||||||
}
|
|
||||||
else if(target.name.ToLower().Contains("gold")){
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Gold ore"));
|
|
||||||
}
|
|
||||||
else if(target.name.ToLower().Contains("copper")){
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Copper ore"));
|
|
||||||
}
|
|
||||||
else if(target.name.ToLower().Contains("tin")){
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Tin ore"));
|
|
||||||
}
|
|
||||||
Destroy(target);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.C))
|
}
|
||||||
{
|
if(direction != MoveDirection.None){
|
||||||
uihandler.switchCharactersheet();
|
AxisEventData data = new AxisEventData(EventSystem.current);
|
||||||
|
data.moveDir = direction;
|
||||||
|
data.selectedObject = EventSystem.current.currentSelectedGameObject;
|
||||||
|
ExecuteEvents.Execute(data.selectedObject, data, ExecuteEvents.moveHandler);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnLooking(InputValue value){
|
||||||
|
view = value.Get<Vector2>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnMovement(InputValue value){
|
||||||
|
try{
|
||||||
|
input = value.Get<Vector3>();
|
||||||
|
}catch{
|
||||||
|
if(value.Get<Vector2>().x < 0){
|
||||||
|
direction = MoveDirection.Left;
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Q))
|
else if(value.Get<Vector2>().x > 0){
|
||||||
{
|
direction = MoveDirection.Right;
|
||||||
uihandler.switchQuestLog();
|
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.I))
|
else if(value.Get<Vector2>().y < 0){
|
||||||
{
|
direction = MoveDirection.Down;
|
||||||
uihandler.switchInventory();
|
}
|
||||||
|
else if(value.Get<Vector2>().y > 0){
|
||||||
|
direction = MoveDirection.Up;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Input.GetKeyDown(KeyCode.Escape))
|
}
|
||||||
|
|
||||||
|
public void OnInteraction(){
|
||||||
|
if (uihandler.canPlayerMove())
|
||||||
{
|
{
|
||||||
uihandler.switchPauseMenu();
|
GameObject target = playerCam.GetComponent<PlayerCamera>().interactWithObject();
|
||||||
|
if (target != null)
|
||||||
|
{
|
||||||
|
switch (target.tag.Split(':')[1])
|
||||||
|
{
|
||||||
|
case "Enemy":
|
||||||
|
fight.GetComponent<Fight>().startFight(worldGen.GetComponent<WorldGenerator>().getCurrentTile(), target, player);
|
||||||
|
break;
|
||||||
|
case "Tree":
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Wood"));
|
||||||
|
Destroy(target);
|
||||||
|
break;
|
||||||
|
case "Stone":
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Rock"));
|
||||||
|
Destroy(target);
|
||||||
|
break;
|
||||||
|
case "NPC":
|
||||||
|
target.GetComponent<NPC>().interact();
|
||||||
|
break;
|
||||||
|
case "Door":
|
||||||
|
target.GetComponent<Door>().interact();
|
||||||
|
break;
|
||||||
|
case "Chest":
|
||||||
|
target.GetComponent<Chest>().interact();
|
||||||
|
break;
|
||||||
|
case "Ore":
|
||||||
|
if(target.name.ToLower().Contains("iron")){
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Iron ore"));
|
||||||
|
}
|
||||||
|
else if(target.name.ToLower().Contains("gold")){
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Gold ore"));
|
||||||
|
}
|
||||||
|
else if(target.name.ToLower().Contains("copper")){
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Copper ore"));
|
||||||
|
}
|
||||||
|
else if(target.name.ToLower().Contains("tin")){
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Tin ore"));
|
||||||
|
}
|
||||||
|
Destroy(target);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkFightControls()
|
public void OnCharsheet(){
|
||||||
{
|
uihandler.switchCharactersheet();
|
||||||
if (Input.GetKeyDown(KeyCode.Alpha1) || Input.GetKeyDown(KeyCode.Keypad1))
|
}
|
||||||
{
|
|
||||||
|
public void OnInventory(){
|
||||||
|
uihandler.switchInventory();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnQuestlog(){
|
||||||
|
uihandler.switchQuestLog();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnPause(){
|
||||||
|
uihandler.switchPauseMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnSkillOne(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(1);
|
fight.GetComponent<Fight>().playerAction(1);
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Alpha2) || Input.GetKeyDown(KeyCode.Keypad2))
|
}
|
||||||
{
|
|
||||||
|
public void OnSkillTwo(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(2);
|
fight.GetComponent<Fight>().playerAction(2);
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Alpha3) || Input.GetKeyDown(KeyCode.Keypad3))
|
}
|
||||||
{
|
|
||||||
|
public void OnSkillThree(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(3);
|
fight.GetComponent<Fight>().playerAction(3);
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Alpha4) || Input.GetKeyDown(KeyCode.Keypad4))
|
}
|
||||||
{
|
|
||||||
|
public void OnSkillFour(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(4);
|
fight.GetComponent<Fight>().playerAction(4);
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Alpha5) || Input.GetKeyDown(KeyCode.Keypad5))
|
}
|
||||||
{
|
|
||||||
|
public void OnSkillFive(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(5);
|
fight.GetComponent<Fight>().playerAction(5);
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.Alpha6) || Input.GetKeyDown(KeyCode.Keypad6))
|
}
|
||||||
{
|
|
||||||
|
public void OnSkillSix(){
|
||||||
|
if(uihandler.isPlayerInFight()){
|
||||||
fight.GetComponent<Fight>().playerAction(6);
|
fight.GetComponent<Fight>().playerAction(6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,7 @@ namespace Assets.Scripts
|
|||||||
System.Random rand = new System.Random();
|
System.Random rand = new System.Random();
|
||||||
BasicSlime slime;
|
BasicSlime slime;
|
||||||
SlimeFactory factory = new SlimeFactory();
|
SlimeFactory factory = new SlimeFactory();
|
||||||
|
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
|
|||||||
@ -2,6 +2,7 @@ using Assets.Scripts;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class Fight : MonoBehaviour
|
public class Fight : MonoBehaviour
|
||||||
@ -23,6 +24,7 @@ public class Fight : MonoBehaviour
|
|||||||
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
|
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
|
||||||
uihandler.openFight();
|
uihandler.openFight();
|
||||||
uihandler.updateFightInterface(enemy, player);
|
uihandler.updateFightInterface(enemy, player);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnActionOne"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void endFight()
|
private void endFight()
|
||||||
@ -91,41 +93,21 @@ public class Fight : MonoBehaviour
|
|||||||
int enemyDamage = -1;
|
int enemyDamage = -1;
|
||||||
// { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence };
|
// { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence };
|
||||||
int[] enemyStats = enemy.GetComponent<Enemy>().getStats();
|
int[] enemyStats = enemy.GetComponent<Enemy>().getStats();
|
||||||
int index = rand.Next(0,3);
|
int index = rand.Next(0,2);
|
||||||
if (enemyStats[0] <= enemyStats[1] / 4 && index != 0)
|
|
||||||
|
if (index == 1 && enemyStats[2] <= 0)
|
||||||
{
|
{
|
||||||
enemyDamage = secondChance();
|
index = 0;
|
||||||
if (enemyDamage != 0)
|
|
||||||
{
|
|
||||||
enemyDamage = secondChance();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (enemyStats[0] <= enemyStats[1] / 2 && index != 0)
|
|
||||||
{
|
|
||||||
enemyDamage = secondChance();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (index == 2 && enemyStats[2] <= 0)
|
switch (index)
|
||||||
{
|
{
|
||||||
index = 1;
|
case 0:
|
||||||
}
|
enemyDamage = enemy.GetComponent<Enemy>().calculateDamage();
|
||||||
|
break;
|
||||||
if (enemyDamage == 0 || index == 0)
|
case 1:
|
||||||
{
|
enemyDamage = enemy.GetComponent<Enemy>().calculateHeavy();
|
||||||
endFight();
|
break;
|
||||||
uihandler.showMessage("INFORMATION;The enemy escaped!");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
switch (index)
|
|
||||||
{
|
|
||||||
case 1:
|
|
||||||
enemyDamage = enemy.GetComponent<Enemy>().calculateDamage();
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
enemyDamage = enemy.GetComponent<Enemy>().calculateHeavy();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.GetComponent<Player>().takeDamage(enemyDamage))
|
if (player.GetComponent<Player>().takeDamage(enemyDamage))
|
||||||
@ -134,10 +116,4 @@ public class Fight : MonoBehaviour
|
|||||||
uihandler.showDeathScreen();
|
uihandler.showDeathScreen();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private int secondChance()
|
|
||||||
{
|
|
||||||
int result = rand.Next(0, 3);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,6 +12,7 @@ namespace Assets.Scripts
|
|||||||
Player player;
|
Player player;
|
||||||
AudioHandler audioHandler;
|
AudioHandler audioHandler;
|
||||||
WorldGenerator worldGenerator;
|
WorldGenerator worldGenerator;
|
||||||
|
GameObject fight;
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
@ -19,6 +20,7 @@ namespace Assets.Scripts
|
|||||||
player = GameObject.Find("Player").GetComponent<Player>();
|
player = GameObject.Find("Player").GetComponent<Player>();
|
||||||
worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
|
worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
|
||||||
audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
|
audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
|
||||||
|
fight = GameObject.Find("Fight");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void openOptions()
|
public void openOptions()
|
||||||
@ -49,35 +51,30 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
player.upgradeStrength();
|
player.upgradeStrength();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void upgradeDexterity()
|
public void upgradeDexterity()
|
||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
player.upgradeDexterity();
|
player.upgradeDexterity();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void upgradeIntelligence()
|
public void upgradeIntelligence()
|
||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
player.upgradeIntelligence();
|
player.upgradeIntelligence();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void upgradeHealth()
|
public void upgradeHealth()
|
||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
player.upgradeHealth();
|
player.upgradeHealth();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void upgradeSecondary()
|
public void upgradeSecondary()
|
||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
player.upgradeSecondary();
|
player.upgradeSecondary();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void saveOptions()
|
public void saveOptions()
|
||||||
@ -86,8 +83,10 @@ namespace Assets.Scripts
|
|||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
|
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
|
||||||
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
|
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
|
||||||
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().speed = GameObject.Find("slideSensitivity").GetComponent<Slider>().value;
|
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
|
||||||
saveText = saveText + "Sensitivity:"+GameObject.Find("slideSensitivity").GetComponent<Slider>().value;
|
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
|
||||||
|
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
|
||||||
|
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
|
||||||
FileHandler.saveOptions(saveText);
|
FileHandler.saveOptions(saveText);
|
||||||
uihandler.closeOptions();
|
uihandler.closeOptions();
|
||||||
}
|
}
|
||||||
@ -96,7 +95,6 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
audioHandler.playButtonClick();
|
audioHandler.playButtonClick();
|
||||||
uihandler.startGame();
|
uihandler.startGame();
|
||||||
EventSystem.current.SetSelectedGameObject(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void switchCharactersheet()
|
public void switchCharactersheet()
|
||||||
@ -135,5 +133,17 @@ namespace Assets.Scripts
|
|||||||
saveString = saveString + "\r\n}";
|
saveString = saveString + "\r\n}";
|
||||||
FileHandler.saveGame(saveString, "./save.json");
|
FileHandler.saveGame(saveString, "./save.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void castSkill(int index){
|
||||||
|
fight.GetComponent<Fight>().playerAction(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void switchOptionView(string key){
|
||||||
|
uihandler.showOptionView(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void closeTutorial(){
|
||||||
|
uihandler.closeTutorial();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -95,9 +95,14 @@ namespace Assets.Scripts
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "Sensitivity":
|
case "SensitivityMouse":
|
||||||
if(isIngame){
|
if(isIngame){
|
||||||
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().speed = float.Parse(line.Split(':')[1]);
|
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = float.Parse(line.Split(':')[1]);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "SensitivityController":
|
||||||
|
if(isIngame){
|
||||||
|
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = float.Parse(line.Split(':')[1]);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -120,8 +125,11 @@ namespace Assets.Scripts
|
|||||||
case "Mode":
|
case "Mode":
|
||||||
GameObject.Find("dropMode").GetComponent<Dropdown>().value = int.Parse(line.Split(':')[1]);
|
GameObject.Find("dropMode").GetComponent<Dropdown>().value = int.Parse(line.Split(':')[1]);
|
||||||
break;
|
break;
|
||||||
case "Sensitivity":
|
case "SensitivityMouse":
|
||||||
GameObject.Find("slideSensitivity").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
|
GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
|
||||||
|
break;
|
||||||
|
case "SensitivityController":
|
||||||
|
GameObject.Find("slideSensitivityController").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,6 +42,9 @@ namespace Assets.Scripts
|
|||||||
updatePlayerHUD();
|
updatePlayerHUD();
|
||||||
switchWaterLayer();
|
switchWaterLayer();
|
||||||
updateCoordinates();
|
updateCoordinates();
|
||||||
|
if(EventSystem.current.currentSelectedGameObject != null){
|
||||||
|
EventSystem.current.SetSelectedGameObject(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,6 +110,7 @@ namespace Assets.Scripts
|
|||||||
tutorial.transform.localScale = new Vector3(1, 1, 1);
|
tutorial.transform.localScale = new Vector3(1, 1, 1);
|
||||||
showHUD();
|
showHUD();
|
||||||
state = UIState.TUTORIAL;
|
state = UIState.TUTORIAL;
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnCloseTutorial"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void switchCharactersheet()
|
public void switchCharactersheet()
|
||||||
@ -127,7 +131,8 @@ namespace Assets.Scripts
|
|||||||
FileHandler.loadOptionDisplay();
|
FileHandler.loadOptionDisplay();
|
||||||
hideOtherElements(options);
|
hideOtherElements(options);
|
||||||
state = UIState.PAUSEOPTIONS;
|
state = UIState.PAUSEOPTIONS;
|
||||||
GameObject.Find("ScrollbarOptions").GetComponent<Scrollbar>().value = 1f;
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnAudio"));
|
||||||
|
showOptionView("audio");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeOptions()
|
public void closeOptions()
|
||||||
@ -141,6 +146,9 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
hideOtherElements(charactersheet);
|
hideOtherElements(charactersheet);
|
||||||
state = UIState.CHARACTER;
|
state = UIState.CHARACTER;
|
||||||
|
if(GameObject.Find("btnStrengthIncrease").transform.localScale != new Vector3(0,0,0)){
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStrengthIncrease"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeCharactersheet()
|
public void closeCharactersheet()
|
||||||
@ -166,12 +174,13 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
hideOtherElements(inventory);
|
hideOtherElements(inventory);
|
||||||
state = UIState.INVENTORY;
|
state = UIState.INVENTORY;
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("bagOne"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeInventory()
|
public void closeInventory()
|
||||||
{
|
{
|
||||||
inventory.GetComponent<Inventory>().OnMouseUp();
|
|
||||||
inventory.transform.localScale = new Vector3(0, 0, 0);
|
inventory.transform.localScale = new Vector3(0, 0, 0);
|
||||||
|
GameObject.Find("pnlInventoryActions").transform.localScale = new Vector3(0,0,0);
|
||||||
showHUD();
|
showHUD();
|
||||||
state = UIState.GAME;
|
state = UIState.GAME;
|
||||||
}
|
}
|
||||||
@ -242,6 +251,7 @@ namespace Assets.Scripts
|
|||||||
questlog.GetComponent<QuestLog>().showQuests();
|
questlog.GetComponent<QuestLog>().showQuests();
|
||||||
state = UIState.QUEST;
|
state = UIState.QUEST;
|
||||||
hideOtherElements(questlog);
|
hideOtherElements(questlog);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("scrollQuestlog"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeQuestLog()
|
public void closeQuestLog()
|
||||||
@ -298,6 +308,7 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
hideOtherElements(pauseMenu);
|
hideOtherElements(pauseMenu);
|
||||||
state = UIState.PAUSE;
|
state = UIState.PAUSE;
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnContinue"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closePauseMenu()
|
public void closePauseMenu()
|
||||||
@ -311,6 +322,7 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
state = UIState.DEATH;
|
state = UIState.DEATH;
|
||||||
hideOtherElements(deathscreen);
|
hideOtherElements(deathscreen);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnMenu"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void hideOtherElements(GameObject obj)
|
public void hideOtherElements(GameObject obj)
|
||||||
@ -358,9 +370,9 @@ namespace Assets.Scripts
|
|||||||
|
|
||||||
private void updateFightInterfaceActions(GameObject player)
|
private void updateFightInterfaceActions(GameObject player)
|
||||||
{
|
{
|
||||||
GameObject actionFour = GameObject.Find("action4");
|
GameObject actionFour = GameObject.Find("btnActionFour");
|
||||||
GameObject actionFive = GameObject.Find("action5");
|
GameObject actionFive = GameObject.Find("btnActionFive");
|
||||||
GameObject actionSix = GameObject.Find("action6");
|
GameObject actionSix = GameObject.Find("btnActionSix");
|
||||||
|
|
||||||
player.GetComponent<Player>().displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject);
|
player.GetComponent<Player>().displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject);
|
||||||
player.GetComponent<Player>().displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject);
|
player.GetComponent<Player>().displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject);
|
||||||
@ -533,6 +545,7 @@ namespace Assets.Scripts
|
|||||||
GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
|
GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
|
||||||
hideOtherElements(introduction);
|
hideOtherElements(introduction);
|
||||||
state = UIState.INTRODUCTION;
|
state = UIState.INTRODUCTION;
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnClose"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -551,5 +564,17 @@ namespace Assets.Scripts
|
|||||||
tutorial.transform.localScale = new Vector3(0,0,0);
|
tutorial.transform.localScale = new Vector3(0,0,0);
|
||||||
state = UIState.GAME;
|
state = UIState.GAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void showOptionView(string key){
|
||||||
|
GameObject optionContent = GameObject.Find("pnlContent");
|
||||||
|
for(int i = 0; i < optionContent.transform.childCount; i++){
|
||||||
|
if(optionContent.transform.GetChild(i).name.ToLower().Contains(key)){
|
||||||
|
optionContent.transform.GetChild(i).transform.localScale = new Vector3(1,1,1);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
optionContent.transform.GetChild(i).transform.localScale = new Vector3(0,0,0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -18,7 +18,6 @@ namespace Assets.Scripts
|
|||||||
public GameObject amulet;
|
public GameObject amulet;
|
||||||
public GameObject leftHand;
|
public GameObject leftHand;
|
||||||
public GameObject rightHand;
|
public GameObject rightHand;
|
||||||
public GameObject dragImage;
|
|
||||||
public GameObject itemDisplay;
|
public GameObject itemDisplay;
|
||||||
|
|
||||||
public GameObject[] bags;
|
public GameObject[] bags;
|
||||||
@ -28,8 +27,9 @@ namespace Assets.Scripts
|
|||||||
|
|
||||||
public int currentBag = -1;
|
public int currentBag = -1;
|
||||||
|
|
||||||
GameObject startDrag;
|
|
||||||
TooltipHandler tooltip;
|
TooltipHandler tooltip;
|
||||||
|
|
||||||
|
public GameObject currentSlot;
|
||||||
|
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
@ -101,10 +101,10 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
if (currentBag != -1)
|
if (currentBag != -1)
|
||||||
{
|
{
|
||||||
bags[currentBag].transform.Find("Selected").GetComponent<RawImage>().color = Color.white;
|
bags[currentBag].transform.parent.Find("Selected").GetComponent<RawImage>().color = Color.white;
|
||||||
}
|
}
|
||||||
currentBag = index;
|
currentBag = index;
|
||||||
bags[currentBag].transform.Find("Selected").GetComponent<RawImage>().color = Color.cyan;
|
bags[currentBag].transform.parent.Find("Selected").GetComponent<RawImage>().color = Color.cyan;
|
||||||
checkInventoryColors();
|
checkInventoryColors();
|
||||||
foreach(GameObject slot in slots)
|
foreach(GameObject slot in slots)
|
||||||
{
|
{
|
||||||
@ -177,41 +177,6 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDrag(GameObject slot)
|
|
||||||
{
|
|
||||||
startDrag = slot;
|
|
||||||
}
|
|
||||||
|
|
||||||
public GameObject getDrag()
|
|
||||||
{
|
|
||||||
return startDrag;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*public Item getEquip(ItemPlace place)
|
|
||||||
{
|
|
||||||
switch (place)
|
|
||||||
{
|
|
||||||
case ItemPlace.LEFTHAND:
|
|
||||||
return leftHand.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.RIGHTHAND:
|
|
||||||
return rightHand.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.HELMET:
|
|
||||||
return head.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.BOOTS:
|
|
||||||
return feet.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.SHOULDER:
|
|
||||||
return shoulders.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.AMULET:
|
|
||||||
return amulet.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.RING:
|
|
||||||
return ring.GetComponent<InventorySlot>().getEquip();
|
|
||||||
case ItemPlace.ARMOR:
|
|
||||||
return chest.GetComponent<InventorySlot>().getEquip();
|
|
||||||
default:
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
public void calculateStatBoost(Dictionary<string, int> attributes, bool isAddition)
|
public void calculateStatBoost(Dictionary<string, int> attributes, bool isAddition)
|
||||||
{
|
{
|
||||||
foreach (string key in attributes.Keys)
|
foreach (string key in attributes.Keys)
|
||||||
@ -382,12 +347,79 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void OnMouseUp(){
|
|
||||||
if(dragImage.GetComponent<RawImage>().texture != null){
|
public void trashItem(){
|
||||||
dragImage.GetComponent<RawImage>().color = new Color(0,0,0,0);
|
InventorySlot invSlot = currentSlot.GetComponent<InventorySlot>();
|
||||||
dragImage.GetComponent<RawImage>().texture = null;
|
if (invSlot.place == ItemPlace.BAG)
|
||||||
dragImage.transform.position = new Vector3(0,0,0);
|
{
|
||||||
|
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("collect", invSlot.getItem(invSlot.getCurrentBag()), -1);
|
||||||
|
invSlot.removeItem();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("collect", invSlot.getEquip(), -1);
|
||||||
|
invSlot.removeEquip();
|
||||||
|
}
|
||||||
|
hideSlotOptions();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void equipItem(){
|
||||||
|
InventorySlot invSlot = currentSlot.GetComponent<InventorySlot>();
|
||||||
|
if(invSlot.place == ItemPlace.BAG){
|
||||||
|
Equipment save = (Equipment)invSlot.getItem(currentBag);
|
||||||
|
InventorySlot equipSlot;
|
||||||
|
switch(save.getPlace()){
|
||||||
|
case ItemPlace.HELMET:
|
||||||
|
equipSlot = head.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.SHOULDER:
|
||||||
|
equipSlot = shoulders.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.BOOTS:
|
||||||
|
equipSlot = feet.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.AMULET:
|
||||||
|
equipSlot = amulet.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.ARMOR:
|
||||||
|
equipSlot = chest.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.RING:
|
||||||
|
equipSlot = ring.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.RIGHTHAND:
|
||||||
|
equipSlot = rightHand.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
case ItemPlace.LEFTHAND:
|
||||||
|
equipSlot = leftHand.GetComponent<InventorySlot>();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
equipSlot = invSlot;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if(equipSlot.getEquip() != null){
|
||||||
|
invSlot.setItem(equipSlot.getEquip(), currentBag);
|
||||||
|
calculateStatBoost(equipSlot.getEquip().getAttributes(), false);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
invSlot.removeItem();
|
||||||
|
}
|
||||||
|
equipSlot.setEquip(save);
|
||||||
|
calculateStatBoost(equipSlot.getEquip().getAttributes(), true);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
addItem(invSlot.getEquip());
|
||||||
|
calculateStatBoost(invSlot.getEquip().getAttributes(), false);
|
||||||
|
invSlot.removeEquip();
|
||||||
|
}
|
||||||
|
hideSlotOptions();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void hideSlotOptions(){
|
||||||
|
GameObject.Find("pnlInventoryActions").transform.localScale = new Vector3(0,0,0);
|
||||||
|
GameObject.Find("btnEquip").transform.Find("Text").GetComponent<Text>().text = "Equip";
|
||||||
|
GameObject.Find("btnEquip").GetComponent<Button>().interactable = true;
|
||||||
|
EventSystem.current.SetSelectedGameObject(currentSlot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -94,46 +94,7 @@ namespace Assets.Scripts
|
|||||||
inventory.itemDisplay.transform.localScale = new Vector3(0,0,0);
|
inventory.itemDisplay.transform.localScale = new Vector3(0,0,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnMouseDrag()
|
|
||||||
{
|
|
||||||
inventory.setDrag(gameObject);
|
|
||||||
Item toMove;
|
|
||||||
if (place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
toMove = items[currentBag];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
toMove = equip;
|
|
||||||
}
|
|
||||||
if (toMove != null)
|
|
||||||
{
|
|
||||||
inventory.dragImage.GetComponent<RawImage>().color = toMove.rarityColor;
|
|
||||||
inventory.dragImage.GetComponent<RawImage>().texture = toMove.image;
|
|
||||||
inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x + 50, Input.mousePosition.y - 50, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnMouseUp()
|
|
||||||
{
|
|
||||||
inventory.dragImage.GetComponent<RawImage>().color = new Color(0,0,0,0);
|
|
||||||
inventory.dragImage.GetComponent<RawImage>().texture = null;
|
|
||||||
inventory.dragImage.transform.position = new Vector3(0,0,0);
|
|
||||||
InventorySlot startDrag = inventory.getDrag().GetComponent<InventorySlot>();
|
|
||||||
Item item;
|
|
||||||
if (startDrag.place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
item = startDrag.getItem(startDrag.currentBag);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
item = startDrag.getEquip();
|
|
||||||
}
|
|
||||||
if (item != null)
|
|
||||||
{
|
|
||||||
item.move(startDrag, inventory, this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Equipment getEquip()
|
public Equipment getEquip()
|
||||||
{
|
{
|
||||||
@ -235,5 +196,29 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void showSlotOptions(){
|
||||||
|
GameObject current = EventSystem.current.currentSelectedGameObject;
|
||||||
|
GameObject.Find("Inventory").GetComponent<Inventory>().currentSlot = current;
|
||||||
|
GameObject.Find("btnEquip").transform.Find("Text").GetComponent<Text>().text = "Equip";
|
||||||
|
GameObject.Find("btnEquip").GetComponent<Button>().interactable = true;
|
||||||
|
if(equip != null || items[currentBag] != null){
|
||||||
|
if(equip != null){
|
||||||
|
GameObject.Find("btnEquip").transform.Find("Text").GetComponent<Text>().text = "Unequip";
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnEquip"));
|
||||||
|
}
|
||||||
|
if(items[currentBag] != null){
|
||||||
|
if(items[currentBag] is Equipment){
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnEquip"));
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
GameObject.Find("btnEquip").GetComponent<Button>().interactable = false;
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnTrash"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GameObject.Find("pnlInventoryActions").transform.position = new Vector3(current.transform.position.x + 125, current.transform.position.y, 0);
|
||||||
|
GameObject.Find("pnlInventoryActions").transform.localScale = new Vector3(1,1,1);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -34,20 +34,7 @@ namespace Assets.Scripts
|
|||||||
|
|
||||||
public void deleteItem()
|
public void deleteItem()
|
||||||
{
|
{
|
||||||
InventorySlot toDelete = GameObject.Find("Inventory").GetComponent<Inventory>().getDrag().GetComponent<InventorySlot>();
|
|
||||||
if (toDelete.place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("collect", toDelete.getItem(toDelete.getCurrentBag()), -1);
|
|
||||||
toDelete.removeItem();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("collect", toDelete.getEquip(), -1);
|
|
||||||
toDelete.removeEquip();
|
|
||||||
}
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().dragImage.GetComponent<RawImage>().color = new Color(0, 0, 0, 0);
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().dragImage.GetComponent<RawImage>().texture = null;
|
|
||||||
GameObject.Find("Inventory").GetComponent<Inventory>().dragImage.transform.position = new Vector3(0, 0, 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -343,82 +343,6 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
override
|
|
||||||
public void move(InventorySlot startDrag, Inventory inventory, InventorySlot endDrag)
|
|
||||||
{
|
|
||||||
bool isSwap = false;
|
|
||||||
if (endDrag.place != place && endDrag.place != ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (endDrag.place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
Item endItem = endDrag.getItem(endDrag.getCurrentBag());
|
|
||||||
if (endItem != null)
|
|
||||||
{
|
|
||||||
if (endItem is Equipment)
|
|
||||||
{
|
|
||||||
if (((Equipment)endItem).getPlace() != startDrag.place)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (startDrag.place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
startDrag.setItem(endItem, endDrag.getCurrentBag());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (endItem is Equipment)
|
|
||||||
{
|
|
||||||
startDrag.setEquip((Equipment)endItem);
|
|
||||||
inventory.calculateStatBoost(attributes, false);
|
|
||||||
inventory.calculateStatBoost(((Equipment)endItem).getAttributes(), true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
isSwap = true;
|
|
||||||
}
|
|
||||||
endDrag.setItem(this, endDrag.getCurrentBag());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (endDrag.getEquip() != null)
|
|
||||||
{
|
|
||||||
if (startDrag.place == ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
startDrag.setItem(endDrag.getEquip(), startDrag.getCurrentBag());
|
|
||||||
isSwap = true;
|
|
||||||
inventory.calculateStatBoost(endDrag.getEquip().getAttributes(), false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inventory.calculateStatBoost(getAttributes(), true);
|
|
||||||
endDrag.setEquip(this);
|
|
||||||
}
|
|
||||||
if (!isSwap)
|
|
||||||
{
|
|
||||||
if (startDrag.place != ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
inventory.calculateStatBoost(startDrag.getEquip().getAttributes(), false);
|
|
||||||
startDrag.removeEquip();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
startDrag.removeItem();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -172,27 +172,6 @@ namespace Assets.Scripts
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void move(InventorySlot startDrag, Inventory inventory, InventorySlot endDrag)
|
|
||||||
{
|
|
||||||
if (endDrag.place != ItemPlace.BAG)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Item item = endDrag.getItem(endDrag.getCurrentBag());
|
|
||||||
|
|
||||||
if (item != null)
|
|
||||||
{
|
|
||||||
startDrag.setItem(item, endDrag.getCurrentBag());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
startDrag.removeItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
endDrag.setItem(this, startDrag.getCurrentBag());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void chooseItem()
|
private void chooseItem()
|
||||||
{
|
{
|
||||||
int index = rand.Next(4);
|
int index = rand.Next(4);
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
87
Assets/Scripts/Menu/ControlsMenu.cs
Normal file
87
Assets/Scripts/Menu/ControlsMenu.cs
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
using Assets.Scripts;
|
||||||
|
using Assets.Scripts.Menu;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class ControlsMenu : MonoBehaviour
|
||||||
|
{
|
||||||
|
UIHandlerMenu uihandler;
|
||||||
|
MoveDirection direction;
|
||||||
|
PlayerInput playerInput;
|
||||||
|
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandlerMenu>();
|
||||||
|
direction = MoveDirection.None;
|
||||||
|
playerInput = GetComponent<PlayerInput>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
changeNameInput();
|
||||||
|
if(playerInput.currentControlScheme == "Controller"){
|
||||||
|
if(EventSystem.current.currentSelectedGameObject == null){
|
||||||
|
EventSystem.current.SetSelectedGameObject(FindFirstObjectByType<Button>().gameObject);
|
||||||
|
}
|
||||||
|
if(Cursor.lockState != CursorLockMode.Locked){
|
||||||
|
Cursor.lockState = CursorLockMode.Locked;
|
||||||
|
}
|
||||||
|
if(playerInput.currentActionMap.name != "Menu"){
|
||||||
|
playerInput.SwitchCurrentActionMap("Menu");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(Cursor.lockState != CursorLockMode.Confined){
|
||||||
|
Cursor.lockState = CursorLockMode.Confined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void FixedUpdate(){
|
||||||
|
if(direction != MoveDirection.None){
|
||||||
|
AxisEventData data = new AxisEventData(EventSystem.current);
|
||||||
|
data.moveDir = direction;
|
||||||
|
data.selectedObject = EventSystem.current.currentSelectedGameObject;
|
||||||
|
ExecuteEvents.Execute(data.selectedObject, data, ExecuteEvents.moveHandler);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnMovement(InputValue value){
|
||||||
|
if(value.Get<Vector2>().x < 0){
|
||||||
|
direction = MoveDirection.Left;
|
||||||
|
}
|
||||||
|
else if(value.Get<Vector2>().x > 0){
|
||||||
|
direction = MoveDirection.Right;
|
||||||
|
}
|
||||||
|
else if(value.Get<Vector2>().y < 0){
|
||||||
|
direction = MoveDirection.Down;
|
||||||
|
}
|
||||||
|
else if(value.Get<Vector2>().y > 0){
|
||||||
|
direction = MoveDirection.Up;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnBack(){
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void changeNameInput(){
|
||||||
|
if(uihandler.isCharacterCreation()){
|
||||||
|
if(playerInput.currentControlScheme == "Controller"){
|
||||||
|
if(EventSystem.current.currentSelectedGameObject == null || EventSystem.current.currentSelectedGameObject == GameObject.Find("inName")){
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnRandomName"));
|
||||||
|
}
|
||||||
|
GameObject.Find("inName").GetComponent<InputField>().interactable = false;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
GameObject.Find("inName").GetComponent<InputField>().interactable = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Menu/ControlsMenu.cs.meta
Normal file
11
Assets/Scripts/Menu/ControlsMenu.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ecb843ecde843f11c98ebad43887bfde
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -22,6 +22,7 @@ namespace Assets.Scripts.Menu
|
|||||||
characterCreation.SetActive(false);
|
characterCreation.SetActive(false);
|
||||||
mainMenu.SetActive(true);
|
mainMenu.SetActive(true);
|
||||||
SteamWorksHandler.getStandardAchievement("StartAchievement");
|
SteamWorksHandler.getStandardAchievement("StartAchievement");
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startGame(SceneHandler sceneHandler)
|
public void startGame(SceneHandler sceneHandler)
|
||||||
@ -96,12 +97,14 @@ namespace Assets.Scripts.Menu
|
|||||||
{
|
{
|
||||||
characterCreation.SetActive(true);
|
characterCreation.SetActive(true);
|
||||||
mainMenu.SetActive(false);
|
mainMenu.SetActive(false);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("inName"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeCharacterCreation()
|
public void closeCharacterCreation()
|
||||||
{
|
{
|
||||||
characterCreation.SetActive(false);
|
characterCreation.SetActive(false);
|
||||||
mainMenu.SetActive(true);
|
mainMenu.SetActive(true);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void openOptions()
|
public void openOptions()
|
||||||
@ -109,13 +112,15 @@ namespace Assets.Scripts.Menu
|
|||||||
options.SetActive(true);
|
options.SetActive(true);
|
||||||
mainMenu.SetActive(false);
|
mainMenu.SetActive(false);
|
||||||
FileHandler.loadOptionDisplay();
|
FileHandler.loadOptionDisplay();
|
||||||
GameObject.Find("ScrollbarOptions").GetComponent<Scrollbar>().value = 1f;
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnAudio"));
|
||||||
|
showOptionView("audio");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void closeOptions()
|
public void closeOptions()
|
||||||
{
|
{
|
||||||
options.SetActive(false);
|
options.SetActive(false);
|
||||||
mainMenu.SetActive(true);
|
mainMenu.SetActive(true);
|
||||||
|
EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public string saveVideoSettings(){
|
public string saveVideoSettings(){
|
||||||
@ -181,5 +186,21 @@ namespace Assets.Scripts.Menu
|
|||||||
PlayerPrefs.SetInt("isLoad", 1);
|
PlayerPrefs.SetInt("isLoad", 1);
|
||||||
sceneHandler.openGameScene();
|
sceneHandler.openGameScene();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool isCharacterCreation(){
|
||||||
|
return characterCreation.activeSelf;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void showOptionView(string key){
|
||||||
|
GameObject optionContent = GameObject.Find("pnlContent");
|
||||||
|
for(int i = 0; i < optionContent.transform.childCount; i++){
|
||||||
|
if(optionContent.transform.GetChild(i).name.ToLower().Contains(key)){
|
||||||
|
optionContent.transform.GetChild(i).transform.localScale = new Vector3(1,1,1);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
optionContent.transform.GetChild(i).transform.localScale = new Vector3(0,0,0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -8,6 +8,7 @@ using UnityEngine.UI;
|
|||||||
using Assets.Scripts.Classes;
|
using Assets.Scripts.Classes;
|
||||||
using Assets.Scripts.Races;
|
using Assets.Scripts.Races;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
namespace Assets.Scripts
|
namespace Assets.Scripts
|
||||||
{
|
{
|
||||||
@ -46,6 +47,8 @@ namespace Assets.Scripts
|
|||||||
Dictionary<string, int> equipment;
|
Dictionary<string, int> equipment;
|
||||||
bool finishedGame = false;
|
bool finishedGame = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
@ -62,6 +65,7 @@ namespace Assets.Scripts
|
|||||||
{
|
{
|
||||||
equipment = GameObject.Find("Inventory").GetComponent<Inventory>().getEquipmentBonus();
|
equipment = GameObject.Find("Inventory").GetComponent<Inventory>().getEquipmentBonus();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finishPlayerCreation()
|
public void finishPlayerCreation()
|
||||||
@ -247,13 +251,11 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void move()
|
public void move(Vector3 input)
|
||||||
{
|
{
|
||||||
GameObject camera = GameObject.Find("Main Camera");
|
GameObject camera = GameObject.Find("Main Camera");
|
||||||
float x = Input.GetAxis("Horizontal");
|
|
||||||
float z = Input.GetAxis("Vertical");
|
|
||||||
|
|
||||||
if (Input.GetKeyDown(KeyCode.Space))
|
if (input.y != 0)
|
||||||
{
|
{
|
||||||
if (jumpTimer != null)
|
if (jumpTimer != null)
|
||||||
{
|
{
|
||||||
@ -272,12 +274,12 @@ namespace Assets.Scripts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector3 movement = new Vector3(x, 0, z);
|
Vector3 movement = new Vector3(input.x, 0, input.z);
|
||||||
movement = camera.transform.TransformDirection(movement);
|
movement = camera.transform.TransformDirection(movement);
|
||||||
movement.y = 0;
|
movement.y = 0;
|
||||||
gameObject.transform.Translate(movement * speed * Time.deltaTime);
|
gameObject.transform.Translate(movement * speed * Time.deltaTime);
|
||||||
|
|
||||||
if (z != 0)
|
if (input.z != 0)
|
||||||
{
|
{
|
||||||
if (camera.transform.localPosition.y >= 0.5)
|
if (camera.transform.localPosition.y >= 0.5)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -10,9 +10,10 @@ namespace Assets.Scripts
|
|||||||
UIHandler uihandler;
|
UIHandler uihandler;
|
||||||
GameObject player;
|
GameObject player;
|
||||||
Vector2 rotation = Vector2.zero;
|
Vector2 rotation = Vector2.zero;
|
||||||
public float speed = 1; //the sensibility
|
public float mouseSpeed = 1; //the sensibility
|
||||||
public float xMaxLimit = 5.0f;
|
public float controllerSpeed = 0.01f; //the sensibility
|
||||||
public float xMinLimit = -5.0f;
|
float xMaxLimit = 50.0f;
|
||||||
|
float xMinLimit = -50.0f;
|
||||||
GameObject interact;
|
GameObject interact;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
@ -27,16 +28,6 @@ namespace Assets.Scripts
|
|||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if(uihandler.canPlayerRotate()){
|
|
||||||
Cursor.lockState = CursorLockMode.Locked;
|
|
||||||
rotation.y += Input.GetAxis("Mouse X");
|
|
||||||
rotation.x += -Input.GetAxis("Mouse Y");
|
|
||||||
rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit);
|
|
||||||
transform.eulerAngles = (Vector2)rotation * speed;
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
Cursor.lockState = CursorLockMode.Confined;
|
|
||||||
}
|
|
||||||
transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z);
|
transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,6 +36,18 @@ namespace Assets.Scripts
|
|||||||
showInformation();
|
showInformation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void lookAround(Vector2 view, bool isController){
|
||||||
|
rotation.y += view.x;
|
||||||
|
rotation.x += -view.y;
|
||||||
|
rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit);
|
||||||
|
if(isController){
|
||||||
|
transform.eulerAngles = (Vector2)rotation * controllerSpeed;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
transform.eulerAngles = (Vector2)rotation * mouseSpeed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public GameObject interactWithObject()
|
public GameObject interactWithObject()
|
||||||
{
|
{
|
||||||
RaycastHit hit;
|
RaycastHit hit;
|
||||||
|
|||||||
@ -101,7 +101,7 @@ namespace Assets.Scripts.Slimes
|
|||||||
public Item getItem()
|
public Item getItem()
|
||||||
{
|
{
|
||||||
int rand = new System.Random().Next(100) + 1;
|
int rand = new System.Random().Next(100) + 1;
|
||||||
if (rand < 10 + luck)
|
if (rand < 15 + luck)
|
||||||
{
|
{
|
||||||
int type = new System.Random().Next(2);
|
int type = new System.Random().Next(2);
|
||||||
switch (type)
|
switch (type)
|
||||||
|
|||||||
@ -314,4 +314,4 @@ public class Tile : MonoBehaviour
|
|||||||
setPosition(pos);
|
setPosition(pos);
|
||||||
setBorders();
|
setBorders();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -88,11 +88,10 @@ public class WorldGenerator : MonoBehaviour
|
|||||||
Vector3 pos = currentTile.GetComponent<Tile>().needConnectedTile(playerX, playerZ);
|
Vector3 pos = currentTile.GetComponent<Tile>().needConnectedTile(playerX, playerZ);
|
||||||
if (!tiles.ContainsKey(pos) && pos.y == 0)
|
if (!tiles.ContainsKey(pos) && pos.y == 0)
|
||||||
{
|
{
|
||||||
GameObject newTile;
|
|
||||||
string name = "";
|
string name = "";
|
||||||
int chance = rand.Next(1,11);
|
int chance = rand.Next(1,11);
|
||||||
Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100);
|
Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100);
|
||||||
newTile = Instantiate(tile, mapPos, Quaternion.identity);
|
GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity);
|
||||||
if (chance == 1)
|
if (chance == 1)
|
||||||
{
|
{
|
||||||
if (cityAmount > 0)
|
if (cityAmount > 0)
|
||||||
|
|||||||
@ -1,9 +1,12 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"com.rlabrecque.steamworks.net": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.1.0",
|
||||||
"com.unity.collab-proxy": "2.0.1",
|
"com.unity.collab-proxy": "2.0.1",
|
||||||
"com.unity.ide.rider": "3.0.18",
|
"com.unity.ide.rider": "3.0.18",
|
||||||
"com.unity.ide.visualstudio": "2.0.17",
|
"com.unity.ide.visualstudio": "2.0.17",
|
||||||
"com.unity.ide.vscode": "1.2.5",
|
"com.unity.ide.vscode": "1.2.5",
|
||||||
|
"com.unity.inputsystem": "1.5.1",
|
||||||
|
"com.unity.nuget.newtonsoft-json": "3.1.0",
|
||||||
"com.unity.test-framework": "1.1.31",
|
"com.unity.test-framework": "1.1.31",
|
||||||
"com.unity.textmeshpro": "3.0.6",
|
"com.unity.textmeshpro": "3.0.6",
|
||||||
"com.unity.timeline": "1.6.4",
|
"com.unity.timeline": "1.6.4",
|
||||||
@ -39,8 +42,6 @@
|
|||||||
"com.unity.modules.video": "1.0.0",
|
"com.unity.modules.video": "1.0.0",
|
||||||
"com.unity.modules.vr": "1.0.0",
|
"com.unity.modules.vr": "1.0.0",
|
||||||
"com.unity.modules.wind": "1.0.0",
|
"com.unity.modules.wind": "1.0.0",
|
||||||
"com.unity.modules.xr": "1.0.0",
|
"com.unity.modules.xr": "1.0.0"
|
||||||
"com.unity.nuget.newtonsoft-json": "3.1.0",
|
|
||||||
"com.rlabrecque.steamworks.net": "https://github.com/rlabrecque/Steamworks.NET.git?path=/com.rlabrecque.steamworks.net#20.1.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,6 +46,15 @@
|
|||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.unity.inputsystem": {
|
||||||
|
"version": "1.5.1",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.modules.uielements": "1.0.0"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
"com.unity.nuget.newtonsoft-json": {
|
"com.unity.nuget.newtonsoft-json": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@ -293,3 +293,4 @@ InputManager:
|
|||||||
type: 0
|
type: 0
|
||||||
axis: 0
|
axis: 0
|
||||||
joyNum: 0
|
joyNum: 0
|
||||||
|
m_UsePhysicalKeys: 0
|
||||||
|
|||||||
@ -715,7 +715,7 @@ PlayerSettings:
|
|||||||
m_VersionCode: 1
|
m_VersionCode: 1
|
||||||
m_VersionName:
|
m_VersionName:
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
activeInputHandler: 0
|
activeInputHandler: 2
|
||||||
windowsGamepadBackendHint: 0
|
windowsGamepadBackendHint: 0
|
||||||
cloudProjectId:
|
cloudProjectId:
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
13
UserSettings/Search.index
Normal file
13
UserSettings/Search.index
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"name": "Assets",
|
||||||
|
"roots": ["Assets"],
|
||||||
|
"includes": [],
|
||||||
|
"excludes": [],
|
||||||
|
"options": {
|
||||||
|
"types": true,
|
||||||
|
"properties": true,
|
||||||
|
"extended": false,
|
||||||
|
"dependencies": false
|
||||||
|
},
|
||||||
|
"baseScore": 999
|
||||||
|
}
|
||||||
@ -1 +1,69 @@
|
|||||||
{}
|
trackSelection = true
|
||||||
|
fetchPreview = true
|
||||||
|
defaultFlags = 0
|
||||||
|
keepOpen = false
|
||||||
|
queryFolder = "Assets"
|
||||||
|
onBoardingDoNotAskAgain = true
|
||||||
|
showPackageIndexes = false
|
||||||
|
showStatusBar = false
|
||||||
|
scopes = {
|
||||||
|
"last_search.DA949528" = ""
|
||||||
|
"OpenInspectorPreview.DA949528" = "0"
|
||||||
|
"currentGroup.DA949528" = "all"
|
||||||
|
}
|
||||||
|
providers = {
|
||||||
|
packages = {
|
||||||
|
active = true
|
||||||
|
priority = 90
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
log = {
|
||||||
|
active = false
|
||||||
|
priority = 210
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
store = {
|
||||||
|
active = true
|
||||||
|
priority = 100
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
scene = {
|
||||||
|
active = true
|
||||||
|
priority = 50
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
performance = {
|
||||||
|
active = false
|
||||||
|
priority = 100
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
find = {
|
||||||
|
active = true
|
||||||
|
priority = 25
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
asset = {
|
||||||
|
active = true
|
||||||
|
priority = 25
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
adb = {
|
||||||
|
active = false
|
||||||
|
priority = 2500
|
||||||
|
defaultAction = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objectSelectors = {
|
||||||
|
}
|
||||||
|
recentSearches = [
|
||||||
|
]
|
||||||
|
searchItemFavorites = [
|
||||||
|
]
|
||||||
|
savedSearchesSortOrder = 0
|
||||||
|
showSavedSearchPanel = false
|
||||||
|
expandedQueries = [
|
||||||
|
]
|
||||||
|
queryBuilder = false
|
||||||
|
ignoredProperties = "id;name;classname;imagecontentshash"
|
||||||
|
helperWidgetCurrentArea = "all"
|
||||||
|
disabledIndexers = ""
|
||||||
11
settings.txt
11
settings.txt
@ -1,5 +1,6 @@
|
|||||||
Resolution:2
|
Resolution:0
|
||||||
Mode:2
|
Mode:0
|
||||||
Music:0.05210853
|
Music:0
|
||||||
Effects:0.4071819
|
Effects:0
|
||||||
Sensitivity:10
|
SensitivityMouse:1
|
||||||
|
SensitivityController:1
|
||||||
Loading…
x
Reference in New Issue
Block a user