Modified tile find system. Fixed bot Ai controller
This commit is contained in:
AlexMamontow
parent
3ae4f04d7c
commit
b6cbb693dc
214
Assets/Animation/SettingsPanel.controller
Normal file
214
Assets/Animation/SettingsPanel.controller
Normal file
@ -0,0 +1,214 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1101 &-6153033791757614809
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name:
|
||||
m_Conditions:
|
||||
- m_ConditionMode: 1
|
||||
m_ConditionEvent: isActive
|
||||
m_EventTreshold: 0
|
||||
m_DstStateMachine: {fileID: 0}
|
||||
m_DstState: {fileID: -1955298513558507539}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0.25
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.5
|
||||
m_HasExitTime: 0
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1107 &-2641772171323376554
|
||||
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: -1955298513558507539}
|
||||
m_Position: {x: 350, y: 350, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 3436308536574213419}
|
||||
m_Position: {x: 540, y: 210, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 3550865494197502298}
|
||||
m_Position: {x: 270, y: 130, 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: 3550865494197502298}
|
||||
--- !u!1102 &-1955298513558507539
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Show
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions:
|
||||
- {fileID: 4170102699596670128}
|
||||
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: a8414fe93a761c54fbf861ef23813b5e, 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: SettingsPanel
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters:
|
||||
- m_Name: isActive
|
||||
m_Type: 4
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 0}
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: -2641772171323376554}
|
||||
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!1102 &3436308536574213419
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Hide
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions:
|
||||
- {fileID: -6153033791757614809}
|
||||
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: 64d95de7c90d85042addc6a45149090d, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &3550865494197502298
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Start
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions:
|
||||
- {fileID: 8771871439954256720}
|
||||
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: 463c7225a163eec4aa7146ec3f1e5b02, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1101 &4170102699596670128
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name:
|
||||
m_Conditions:
|
||||
- m_ConditionMode: 2
|
||||
m_ConditionEvent: isActive
|
||||
m_EventTreshold: 0
|
||||
m_DstStateMachine: {fileID: 0}
|
||||
m_DstState: {fileID: 3436308536574213419}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0.25
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.5
|
||||
m_HasExitTime: 0
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1101 &8771871439954256720
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name:
|
||||
m_Conditions:
|
||||
- m_ConditionMode: 1
|
||||
m_ConditionEvent: isActive
|
||||
m_EventTreshold: 0
|
||||
m_DstStateMachine: {fileID: 0}
|
||||
m_DstState: {fileID: -1955298513558507539}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0.25
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.75
|
||||
m_HasExitTime: 0
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 2
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
8
Assets/Animation/SettingsPanel.controller.meta
Normal file
8
Assets/Animation/SettingsPanel.controller.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8fe61cb2c494a114e9b92e92330e1ded
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Animation/UI/Settings.meta
Normal file
8
Assets/Animation/UI/Settings.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 09fa8eb931a54d944babc2161757a2f8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
161
Assets/Animation/UI/Settings/Hide.anim
Normal file
161
Assets/Animation/UI/Settings/Hide.anim
Normal file
@ -0,0 +1,161 @@
|
||||
%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: Hide
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2081
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 30
|
||||
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: 1460864421
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0.5
|
||||
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: -2081
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
8
Assets/Animation/UI/Settings/Hide.anim.meta
Normal file
8
Assets/Animation/UI/Settings/Hide.anim.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 64d95de7c90d85042addc6a45149090d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
161
Assets/Animation/UI/Settings/Show.anim
Normal file
161
Assets/Animation/UI/Settings/Show.anim
Normal file
@ -0,0 +1,161 @@
|
||||
%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: Show
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2081
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 30
|
||||
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: 1460864421
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0.5
|
||||
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: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2081
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
8
Assets/Animation/UI/Settings/Show.anim.meta
Normal file
8
Assets/Animation/UI/Settings/Show.anim.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a8414fe93a761c54fbf861ef23813b5e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
143
Assets/Animation/UI/Settings/Start.anim
Normal file
143
Assets/Animation/UI/Settings/Start.anim
Normal file
@ -0,0 +1,143 @@
|
||||
%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: Start
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves:
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
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: 1460864421
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0
|
||||
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: -2431
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.x
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
8
Assets/Animation/UI/Settings/Start.anim.meta
Normal file
8
Assets/Animation/UI/Settings/Start.anim.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 463c7225a163eec4aa7146ec3f1e5b02
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Prefabs_NEW/LevelTiles.meta
Normal file
8
Assets/Prefabs_NEW/LevelTiles.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1241200b7c638b44a97ba9acd0f0a577
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
47264
Assets/Prefabs_NEW/LevelTiles/Level_1_Tiles.prefab
Normal file
47264
Assets/Prefabs_NEW/LevelTiles/Level_1_Tiles.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs_NEW/LevelTiles/Level_1_Tiles.prefab.meta
Normal file
7
Assets/Prefabs_NEW/LevelTiles/Level_1_Tiles.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6731782785b7a5e45a262bb4d74da83e
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
84000
Assets/Prefabs_NEW/LevelTiles/Level_2_Tiles.prefab
Normal file
84000
Assets/Prefabs_NEW/LevelTiles/Level_2_Tiles.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs_NEW/LevelTiles/Level_2_Tiles.prefab.meta
Normal file
7
Assets/Prefabs_NEW/LevelTiles/Level_2_Tiles.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4bee884320cc14c4cbb972d1be70e749
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0c5841e958f544741bcbe6ac5d097bb0
|
||||
guid: 14cf6319e1e8c7648992aba2c9c5caa0
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
31422
Assets/Scenes/TestLevel.unity
Normal file
31422
Assets/Scenes/TestLevel.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/TestLevel.unity.meta
Normal file
7
Assets/Scenes/TestLevel.unity.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23269e68941dc854ea643310f62e3eac
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -26,7 +26,7 @@ public class AI_BotController : MonoBehaviour
|
||||
|
||||
private Bonus _currentBonus;
|
||||
|
||||
private List<TileInfo> _currentFollowingPath = new List<TileInfo>();
|
||||
public List<TileInfo> _currentFollowingPath = new List<TileInfo>();
|
||||
|
||||
private PlayerState _playerState;
|
||||
private AttackEnergyController _attackEnergyController;
|
||||
@ -43,7 +43,7 @@ public class AI_BotController : MonoBehaviour
|
||||
private bool isUseBonusEnabled = true;
|
||||
|
||||
private int _maxTriesToCalculatePath = 15;
|
||||
private int _triesToCalculatePath = 15;
|
||||
private int _triesToCalculatePath = 0;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@ -159,19 +159,25 @@ public class AI_BotController : MonoBehaviour
|
||||
//calculate path
|
||||
TileInfo currentTile = _playerState.currentTile;
|
||||
TileInfo targetPathTile = TileManagment.GetClosestOtherTile(currentTile, _playerState.ownerIndex, _startBotPoint);
|
||||
Debug.Log(targetPathTile + " in pos "+ targetPathTile.tilePosition);
|
||||
_triesToCalculatePath++;
|
||||
//Debug.Log(targetPathTile);
|
||||
if (!RecalculatePath(currentTile, targetPathTile) && _triesToCalculatePath < _maxTriesToCalculatePath)
|
||||
if (_triesToCalculatePath < _maxTriesToCalculatePath)
|
||||
{
|
||||
StartPatrolBehaviour();
|
||||
return;
|
||||
if (!RecalculatePath(currentTile, targetPathTile))
|
||||
{
|
||||
Debug.Log("recursion");
|
||||
StartPatrolBehaviour();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("not found path by max tries");
|
||||
|
||||
targetPathTile = TileManagment.GetRandomOtherTile(_playerState.ownerIndex);
|
||||
RecalculatePath(currentTile, targetPathTile);
|
||||
}
|
||||
if (_currentFollowingPath.Count > 0)
|
||||
if (_currentFollowingPath!=null)
|
||||
{
|
||||
botState = BotState.Patrol;
|
||||
_triesToCalculatePath = 0;
|
||||
@ -183,6 +189,7 @@ public class AI_BotController : MonoBehaviour
|
||||
{
|
||||
_currentEnemy = null;
|
||||
_startBotPoint = _playerState.currentTile.tilePosition;
|
||||
//Debug.Log(_startBotPoint);
|
||||
//botState = BotState.Patrol;
|
||||
}
|
||||
|
||||
@ -391,6 +398,7 @@ public class AI_BotController : MonoBehaviour
|
||||
|
||||
private void SetBehaviour(BotState state)
|
||||
{
|
||||
//leftInput = Vector2.zero;
|
||||
switch (state)
|
||||
{
|
||||
case BotState.Patrol:
|
||||
@ -491,7 +499,7 @@ public class AI_BotController : MonoBehaviour
|
||||
_currentFollowingPath.Clear();
|
||||
}
|
||||
_currentFollowingPath = Pathfinding.FindPath(curentPos, target, TileManagment.levelTiles, TileManagment.tileOffset);
|
||||
//Debug.Log("created path to " + target);
|
||||
Debug.Log("created path to " + target);
|
||||
if (_currentFollowingPath != null)
|
||||
{
|
||||
return true;
|
||||
|
||||
@ -19,6 +19,10 @@ public class AudioController : MonoBehaviour
|
||||
|
||||
public void PlayJumpSound()
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = _startVolume;
|
||||
int sfxIndex = Random.Range(0, jump_SFXs.Count);
|
||||
ac.PlayOneShot(jump_SFXs[sfxIndex]);
|
||||
@ -26,6 +30,10 @@ public class AudioController : MonoBehaviour
|
||||
|
||||
public void PlayCapSound()
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = _startVolume;
|
||||
int sfxIndex = Random.Range(0, capture_SFXs.Count);
|
||||
ac.PlayOneShot(capture_SFXs[sfxIndex]);
|
||||
@ -33,17 +41,29 @@ public class AudioController : MonoBehaviour
|
||||
|
||||
public void PlayHitSound()
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = 0.5f*_startVolume;
|
||||
ac.PlayOneShot(hit_SFX);
|
||||
}
|
||||
|
||||
public void PlayCollectSound( AudioClip clip)
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = _startVolume;
|
||||
ac.PlayOneShot(clip);
|
||||
}
|
||||
public void PlayAttackSound()
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = _startVolume;
|
||||
ac.PlayOneShot(throw_SFX);
|
||||
}
|
||||
@ -51,6 +71,10 @@ public class AudioController : MonoBehaviour
|
||||
|
||||
public void PlaySound(AudioClip clip)
|
||||
{
|
||||
if (!GameData.isSFXAllowed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ac.volume = 0.4f*_startVolume;
|
||||
ac.PlayOneShot(clip);
|
||||
}
|
||||
|
||||
41
Assets/Scripts/ChooseLevelButtonsTasks.cs
Normal file
41
Assets/Scripts/ChooseLevelButtonsTasks.cs
Normal file
@ -0,0 +1,41 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ChooseLevelButtonsTasks : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Image menuLevelImg;
|
||||
[SerializeField] private List<Sprite> menuSprites;
|
||||
|
||||
private int levelsAmount = 2;
|
||||
|
||||
public void OnPrevBtnClick()
|
||||
{
|
||||
GameData.currentChosenLevel--;
|
||||
if (GameData.currentChosenLevel < 1)
|
||||
{
|
||||
GameData.currentChosenLevel = levelsAmount;
|
||||
}
|
||||
|
||||
menuLevelImg.sprite = menuSprites[GameData.currentChosenLevel - 1];
|
||||
}
|
||||
|
||||
public void OnNextBtnClick()
|
||||
{
|
||||
GameData.currentChosenLevel++;
|
||||
if (GameData.currentChosenLevel > levelsAmount)
|
||||
{
|
||||
GameData.currentChosenLevel = 1;
|
||||
}
|
||||
|
||||
menuLevelImg.sprite = menuSprites[GameData.currentChosenLevel - 1];
|
||||
}
|
||||
|
||||
public void OnTestBtnClick()
|
||||
{
|
||||
SceneLoader.LoadScene(3);
|
||||
}
|
||||
|
||||
}
|
||||
11
Assets/Scripts/ChooseLevelButtonsTasks.cs.meta
Normal file
11
Assets/Scripts/ChooseLevelButtonsTasks.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c693c1c31615e72458a7d7cb06b90c09
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -194,7 +194,10 @@ public class DeathChecker : MonoBehaviour
|
||||
SpawnPlayerDeathParticles(player);
|
||||
}
|
||||
|
||||
deathSrc.Play();
|
||||
if (GameData.isSFXAllowed)
|
||||
{
|
||||
deathSrc.Play();
|
||||
}
|
||||
|
||||
//////////////////////////PLAYER DEATH//////////////
|
||||
if (player.ownerIndex == TileOwner.Ariost)
|
||||
|
||||
@ -7,8 +7,16 @@ public class GameData : MonoBehaviour
|
||||
{
|
||||
public static int coins = 0;
|
||||
public static int playerLevel = 5;
|
||||
public static int gameMaxPlayers = 3;
|
||||
public static int gameMaxPlayers = 2;
|
||||
public static int possibleMaxPlayers = 4;
|
||||
public static int currentChosenLevel = 1;
|
||||
|
||||
public static bool isMusicAllowed = true;
|
||||
public static bool isSFXAllowed = true;
|
||||
|
||||
private const string musKey = "Music settings";
|
||||
private const string sfxKey = "SFX settings";
|
||||
|
||||
|
||||
public static Action OnCoinsCollected;
|
||||
public static void AddCoin(int amount)
|
||||
@ -20,4 +28,25 @@ public class GameData : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public static void SaveSettings()
|
||||
{
|
||||
int musicValue = isMusicAllowed ? 1 : 0;
|
||||
int sfxValue = isSFXAllowed ? 1 : 0;
|
||||
PlayerPrefs.SetInt(musKey, musicValue);
|
||||
PlayerPrefs.SetInt(sfxKey, sfxValue);
|
||||
}
|
||||
|
||||
public static void LoadSettings()
|
||||
{
|
||||
if (!PlayerPrefs.HasKey(musKey))
|
||||
{
|
||||
SaveSettings();
|
||||
}
|
||||
else
|
||||
{
|
||||
isMusicAllowed = PlayerPrefs.GetInt(musKey) == 1 ? true : false;
|
||||
isSFXAllowed = PlayerPrefs.GetInt(sfxKey) == 1 ? true : false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -20,18 +20,27 @@ public class TileManagment : MonoBehaviour
|
||||
|
||||
public static Vector3[] basicDirections;
|
||||
|
||||
[SerializeField]
|
||||
private TileInfo adjTile_1, adjTile_2, targTestTile;
|
||||
|
||||
[SerializeField]
|
||||
private List<Material> _tileMaterials;
|
||||
|
||||
[SerializeField]
|
||||
private Transform _tileParent;
|
||||
|
||||
private static TileInfo[,] lvTilesStruct;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
//OnInitialized = null;
|
||||
//OnAnyTileCaptured = null;
|
||||
InitTileManager();
|
||||
//Debug.Log("tile offset is " + tileOffset + " points");
|
||||
|
||||
//lvTiles = new TileInfo[_tileParent.childCount, _tileParent.childCount];
|
||||
//Vector2.Dot
|
||||
|
||||
}
|
||||
|
||||
private void InitTileManager()
|
||||
@ -51,19 +60,24 @@ public class TileManagment : MonoBehaviour
|
||||
}
|
||||
|
||||
basicDirections = GetBasicDirections(BASIC_DIRECTIONS);
|
||||
tileOffset = GetTileOffset(levelTiles);
|
||||
tileOffset = GetTileOffset();
|
||||
|
||||
//Debug.Log("tile offset is "+ tileOffset);
|
||||
|
||||
lvTilesStruct = new TileInfo[100, 100];
|
||||
foreach (var tile in levelTiles)
|
||||
{
|
||||
lvTilesStruct[(int)Mathf.Round(2 * tile.tilePosition.x / tileOffset), (int)Mathf.Round(-2 * tile.tilePosition.z / tileOffset)] = tile;
|
||||
}
|
||||
|
||||
OnInitialized?.Invoke();
|
||||
|
||||
}
|
||||
|
||||
private float GetTileOffset(List<TileInfo> tiles)
|
||||
{
|
||||
TileInfo firstTile = tiles[0];
|
||||
TileInfo secondTile = tiles[1];
|
||||
|
||||
return Vector3.Distance(firstTile.tilePosition, secondTile.tilePosition);
|
||||
private float GetTileOffset()
|
||||
{
|
||||
return Vector3.Distance(adjTile_1.tilePosition, adjTile_2.tilePosition);
|
||||
}
|
||||
private void SetStaticTileMaterials()
|
||||
{
|
||||
@ -105,6 +119,16 @@ public class TileManagment : MonoBehaviour
|
||||
OnAnyTileCaptured?.Invoke(newPlayer);
|
||||
|
||||
CheckSurroundedTiles(levelTiles, newOwner, oldOwner);
|
||||
|
||||
/*foreach (var newTile in GetOtherTiles(tile, newOwner))
|
||||
{
|
||||
if (newTile.tileOwnerIndex == TileOwner.Neutral)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
CheckIfSurroundedByOwner(levelTiles, newOwner, newTile, newPlayer);
|
||||
}*/
|
||||
|
||||
SetAllPLayersTilesCapState(GameManager.activePlayers);
|
||||
|
||||
}
|
||||
@ -147,9 +171,14 @@ public class TileManagment : MonoBehaviour
|
||||
tile.canBuildHere = true;
|
||||
}
|
||||
|
||||
public static TileInfo GetTileAlt(Vector3 pos)
|
||||
{
|
||||
return lvTilesStruct[(int)Mathf.Round(2f * pos.x / tileOffset), (int)Mathf.Round(-2f * pos.z / tileOffset)];
|
||||
}
|
||||
|
||||
public static TileInfo GetTile(Vector3 position)
|
||||
{
|
||||
TileInfo resultTile = levelTiles[0];
|
||||
/*TileInfo resultTile = levelTiles[0];
|
||||
foreach (TileInfo tile in levelTiles)
|
||||
{
|
||||
if (Vector3.Distance(position, tile.tilePosition) < Vector3.Distance(position, resultTile.tilePosition))
|
||||
@ -164,13 +193,25 @@ public class TileManagment : MonoBehaviour
|
||||
else
|
||||
{
|
||||
return resultTile;
|
||||
}*/
|
||||
if (position.x < 0 || position.z > 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
TileInfo result = lvTilesStruct[(int)Mathf.Round(2f * position.x / tileOffset), (int)Mathf.Round(-2f * position.z / tileOffset)];
|
||||
|
||||
if (result != null)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static TileInfo GetTile(Vector3 currentTilePosition, Vector3 direction, float distance)
|
||||
{
|
||||
direction = direction.normalized;
|
||||
distance = distance - 0.1f;
|
||||
//distance = distance - 0.1f;
|
||||
Vector3 tilePos = currentTilePosition + (direction * distance * tileOffset);
|
||||
return GetTile(tilePos);
|
||||
}
|
||||
@ -292,28 +333,6 @@ public class TileManagment : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*public static void RemoveEasyCaptureForTiles(List<TileInfo> tiles)
|
||||
{
|
||||
foreach (TileInfo tile in tiles)
|
||||
{
|
||||
tile.easyCaptureFor.Clear();
|
||||
tile.isLocked = false;
|
||||
}
|
||||
}*/
|
||||
|
||||
/*public static TileInfo GetClosestOwnerTile(TileInfo startTile, TileOwner owner, float searchRadius)
|
||||
{
|
||||
var ownerTiles = charTiles[(int)owner];
|
||||
TileInfo closestTile = ownerTiles[0];
|
||||
foreach (TileInfo tile in ownerTiles)
|
||||
{
|
||||
//if ()
|
||||
}
|
||||
return closestTile;
|
||||
}*/
|
||||
|
||||
public static TileInfo GetClosestOtherTile(TileInfo currentTile, TileOwner owner,/* float capRadius,*/ Vector3 startPoint)
|
||||
{
|
||||
var neutralTiles = charTiles[(int)TileOwner.Neutral];
|
||||
@ -338,6 +357,9 @@ public class TileManagment : MonoBehaviour
|
||||
{
|
||||
closestTile = tile;
|
||||
}
|
||||
//closestTile = tile;
|
||||
//Debug.Log("changed to " + closestTile);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -449,6 +471,7 @@ public class TileManagment : MonoBehaviour
|
||||
while (q.Count > 0)
|
||||
{
|
||||
var tile = q.Dequeue();
|
||||
//Debug.Log("anotherTile");
|
||||
if (q.Count > tiles.Count)
|
||||
{
|
||||
throw new Exception("The algorithm is probably looping. Queue size: " + q.Count);
|
||||
@ -481,6 +504,7 @@ public class TileManagment : MonoBehaviour
|
||||
foreach (TileInfo tile in connectedTiles)
|
||||
{
|
||||
tile.easyCaptureFor.Add(ownerIndex);
|
||||
//ChangeTileOwnerSilent(tile, ownerIndex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@ public class PlayBtnClick : MonoBehaviour
|
||||
|
||||
private void BtnTask()
|
||||
{
|
||||
SceneLoader.LoadNextScene();
|
||||
//SceneLoader.LoadNextScene();
|
||||
SceneLoader.LoadScene(GameData.currentChosenLevel);
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,6 +8,10 @@ public class PlayerFollower : MonoBehaviour
|
||||
|
||||
private void LateUpdate()
|
||||
{
|
||||
if (_player == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
transform.position = _player.transform.position;
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,6 +46,8 @@ public class PlayerState : MonoBehaviour
|
||||
{
|
||||
SetStartParams();
|
||||
}
|
||||
|
||||
//Debug.Log(TileManagment.GetTileAlt(transform.position));
|
||||
}
|
||||
|
||||
public void ResetEnemies()
|
||||
|
||||
64
Assets/Scripts/SettingsController.cs
Normal file
64
Assets/Scripts/SettingsController.cs
Normal file
@ -0,0 +1,64 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class SettingsController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Sprite musOnSpr, musOffSpr, sfxOnSpr, sfxOffSpr;
|
||||
[SerializeField] private Image musImg, sfxImg;
|
||||
[SerializeField] private AudioSource menuMusSRC;
|
||||
private Animator _ac;
|
||||
private bool _isActive = false;
|
||||
private bool _isMusicAllowed = true;
|
||||
private bool _isSFXAllowed = true;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_ac = GetComponent<Animator>();
|
||||
GameData.LoadSettings();
|
||||
SetMenuMusicState();
|
||||
UpdateVisuals();
|
||||
}
|
||||
|
||||
private void UpdateVisuals()
|
||||
{
|
||||
musImg.sprite = GameData.isMusicAllowed ? musOnSpr : musOffSpr;
|
||||
sfxImg.sprite = GameData.isSFXAllowed ? sfxOnSpr : sfxOffSpr;
|
||||
}
|
||||
|
||||
public void OnSettingsBtnClick()
|
||||
{
|
||||
_isActive = !_isActive;
|
||||
_ac.SetBool("isActive", _isActive);
|
||||
}
|
||||
|
||||
public void OnMusicBtnClick()
|
||||
{
|
||||
GameData.isMusicAllowed = !GameData.isMusicAllowed;
|
||||
musImg.sprite = GameData.isMusicAllowed ? musOnSpr : musOffSpr;
|
||||
SetMenuMusicState();
|
||||
GameData.SaveSettings();
|
||||
|
||||
}
|
||||
|
||||
public void OnSFXBtnClick()
|
||||
{
|
||||
GameData.isSFXAllowed = !GameData.isSFXAllowed;
|
||||
sfxImg.sprite = GameData.isSFXAllowed ? sfxOnSpr : sfxOffSpr;
|
||||
GameData.SaveSettings();
|
||||
}
|
||||
|
||||
private void SetMenuMusicState()
|
||||
{
|
||||
if (GameData.isMusicAllowed)
|
||||
{
|
||||
menuMusSRC.Play();
|
||||
}
|
||||
else
|
||||
{
|
||||
menuMusSRC.Pause();
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/SettingsController.cs.meta
Normal file
11
Assets/Scripts/SettingsController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f25777487ad1d5d4ea2e9d50ff18bd37
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -44,7 +44,7 @@ public class TileMovement : MonoBehaviour
|
||||
break;
|
||||
|
||||
}
|
||||
//_moveDir = new Vector3(CustomInput.leftInput.x, 0f, CustomInput.leftInput.y);
|
||||
_moveDir = RecalculateDir(_moveDir);
|
||||
if (_moveDir.magnitude > Mathf.Epsilon)
|
||||
{
|
||||
TileInfo targetMoveTile = TileManagment.GetTile(_playerState.currentTile.tilePosition, _moveDir, 1);
|
||||
@ -110,4 +110,23 @@ public class TileMovement : MonoBehaviour
|
||||
_playerState.SetNewState(CharacterState.Idle);
|
||||
}
|
||||
}
|
||||
|
||||
private Vector3 RecalculateDir(Vector3 dir)
|
||||
{
|
||||
if (dir.magnitude < 0.3f)
|
||||
{
|
||||
return Vector3.zero;
|
||||
}
|
||||
Vector3 closestDir = TileManagment.basicDirections[0];
|
||||
foreach (var newDir in TileManagment.basicDirections)
|
||||
{
|
||||
float distOld = Vector3.Distance(closestDir, dir);
|
||||
float distNew = Vector3.Distance(newDir, dir);
|
||||
if (distNew < distOld)
|
||||
{
|
||||
closestDir = newDir;
|
||||
}
|
||||
}
|
||||
return closestDir;
|
||||
}
|
||||
}
|
||||
|
||||
BIN
Assets/Sound Pack 01.09/MenuMusic.mp3
Normal file
BIN
Assets/Sound Pack 01.09/MenuMusic.mp3
Normal file
Binary file not shown.
22
Assets/Sound Pack 01.09/MenuMusic.mp3.meta
Normal file
22
Assets/Sound Pack 01.09/MenuMusic.mp3.meta
Normal file
@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5401124604f56d244b2a36c4108b18a7
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sprites/musicSFXIcons.png
Normal file
BIN
Assets/Sprites/musicSFXIcons.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
252
Assets/Sprites/musicSFXIcons.png.meta
Normal file
252
Assets/Sprites/musicSFXIcons.png.meta
Normal file
@ -0,0 +1,252 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3a04baa8a556db543966e91bdf32d327
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -266104563131692492
|
||||
second: musicSFXIcons_0
|
||||
- first:
|
||||
213: 3650524145233249184
|
||||
second: musicSFXIcons_1
|
||||
- first:
|
||||
213: 3389559735050709568
|
||||
second: musicSFXIcons_2
|
||||
- first:
|
||||
213: 337118849721576618
|
||||
second: musicSFXIcons_3
|
||||
- first:
|
||||
213: -5027913215274145821
|
||||
second: musicSFXIcons_4
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
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
|
||||
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: 2
|
||||
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
|
||||
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: Android
|
||||
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: WebGL
|
||||
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:
|
||||
- serializedVersion: 2
|
||||
name: musicSFXIcons_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 200
|
||||
width: 164
|
||||
height: 164
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 43acc694f4b9e4cf0800000000000000
|
||||
internalID: -266104563131692492
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: musicSFXIcons_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 203
|
||||
y: 200
|
||||
width: 164
|
||||
height: 164
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 0a34d986e5449a230800000000000000
|
||||
internalID: 3650524145233249184
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: musicSFXIcons_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 436
|
||||
y: 203
|
||||
width: 164
|
||||
height: 164
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 04a2aa0de922a0f20800000000000000
|
||||
internalID: 3389559735050709568
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: musicSFXIcons_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 20
|
||||
width: 164
|
||||
height: 164
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: aac2eb4cecfada400800000000000000
|
||||
internalID: 337118849721576618
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: musicSFXIcons_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 204
|
||||
y: 22
|
||||
width: 164
|
||||
height: 164
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 3e7a71ad193493ab0800000000000000
|
||||
internalID: -5027913215274145821
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -11,4 +11,10 @@ EditorBuildSettings:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Level_1.unity
|
||||
guid: 9fc0d4010bbf28b4594072e72b8655ab
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Level_2.unity
|
||||
guid: 14cf6319e1e8c7648992aba2c9c5caa0
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/TestLevel.unity
|
||||
guid: 23269e68941dc854ea643310f62e3eac
|
||||
m_configObjects: {}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user