Merge remote-tracking branch 'origin/master'

This commit is contained in:
kabix09 2023-01-05 21:24:18 +01:00
commit 2d088ba775
46 changed files with 136480 additions and 7300 deletions

View File

@ -62,6 +62,7 @@
<Compile Include="Assets\Scripts\REFACTORING\Models\Mission\Dialogue\MissionDialogueData.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Models\Shop\ShopData.cs" />
<Compile Include="Assets\_\Stuff\GridPathfinding\PathNode.cs" />
<Compile Include="Assets\ControlsletterManager.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\Player\Skills\Calculator\PlayerPramCalcullator.cs" />
<Compile Include="Assets\Scripts\Pathfinding\AStarPathfindingAgent.cs" />
<Compile Include="Assets\Scripts\REFACTORING\Application\UI\Inventory\InventoryUIManager.cs" />

View File

@ -1,5 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8807944957692394403
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FireR
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -6044266640305166609}
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: 48203791e98d5fb469e36b708b3f095d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6044266640305166609
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6029362819742638355}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -8,7 +60,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: FireSmallAnimator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Left
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -30,7 +88,13 @@ AnimatorStateMachine:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -8807944957692394403}
m_Position: {x: 350, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 6029362819742638355}
m_Position: {x: 350, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -40,4 +104,56 @@ AnimatorStateMachine:
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: 0}
m_DefaultState: {fileID: -8807944957692394403}
--- !u!1101 &1743029087074317318
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8807944957692394403}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6029362819742638355
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FireL
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1743029087074317318}
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: a1859361e19a0554cba5460b44ad167d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -1,5 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-6943397254604523477
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2365959348471143513}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6666666
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-4354861828076675260
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: KlakonL
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -6943397254604523477}
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: 70721c6185299084594b896c27a2b126, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-3411592718600701116
AnimatorStateMachine:
serializedVersion: 6
@ -8,7 +60,13 @@ AnimatorStateMachine:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2365959348471143513}
m_Position: {x: 447.5, y: 59.5, z: 0}
- serializedVersion: 1
m_State: {fileID: -4354861828076675260}
m_Position: {x: 567.5, y: 171.5, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -18,7 +76,7 @@ AnimatorStateMachine:
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: 0}
m_DefaultState: {fileID: 2365959348471143513}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -27,7 +85,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: KlackonAnimator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Left
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -41,3 +105,55 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2365959348471143513
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: KlakonR
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8935845365986076045}
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: e83b220a3e0073842adc48b2c4fbc1c8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8935845365986076045
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4354861828076675260}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6666666
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

View File

@ -1,5 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-7447278548587052185
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MaskR
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2652441277721942314}
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: 21bb2b58d76526a46bdf9134ac033f9c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6433071791192618860
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7447278548587052185}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2652441277721942314
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1869811757573517742}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-1968551164171211794
AnimatorStateMachine:
serializedVersion: 6
@ -8,7 +85,13 @@ AnimatorStateMachine:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -7447278548587052185}
m_Position: {x: 391.5, y: 49.5, z: 0}
- serializedVersion: 1
m_State: {fileID: -1869811757573517742}
m_Position: {x: 430, y: 150, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -18,7 +101,34 @@ AnimatorStateMachine:
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: 0}
m_DefaultState: {fileID: -7447278548587052185}
--- !u!1102 &-1869811757573517742
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MaskL
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -6433071791192618860}
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: bf72db3db25578e4f90672b34e725e94, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -27,7 +137,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: MaskAnimator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Left
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

View File

@ -8,7 +8,13 @@ AnimatorStateMachine:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 907204890661148098}
m_Position: {x: 438.5, y: 38.5, z: 0}
- serializedVersion: 1
m_State: {fileID: -588614916940599824}
m_Position: {x: 430, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -18,7 +24,59 @@ AnimatorStateMachine:
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: 0}
m_DefaultState: {fileID: 907204890661148098}
--- !u!1101 &-1013299251438931740
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -588614916940599824}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.40000004
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-588614916940599824
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SkullL
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8613725666681874881}
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: 279bae538e781c1468a074bff54ccceb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -27,7 +85,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: SkullAnimator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Left
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -41,3 +105,55 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &907204890661148098
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: sKULLr
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1013299251438931740}
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: d48fceb0a602a0449b6de2e722f9ad71, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8613725666681874881
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: Left
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 907204890661148098}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.40000004
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: f3e939a2bf0ddb240aa8edb8638e6b01
TextureImporter:
internalIDToNameTable: []
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: 1
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
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ControlsletterManager : MonoBehaviour
{
public GameObject LetterPanel;
public GameObject _panel;
// Start is called before the first frame update
void Start()
{
if (PlayerPrefs.GetInt("ControlLetter.WhereDisplayed") == 0)
{
_panel = Instantiate(LetterPanel, GameObject.FindGameObjectWithTag("GUI").transform);
_panel.transform.Find("Button").GetComponent<UnityEngine.UI.Button>().onClick.AddListener(DestroyLetter);
}
}
void DestroyLetter()
{
Destroy(_panel);
PlayerPrefs.SetInt("ControlLetter.WhereDisplayed", 1);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 656bcb92d555a5648b47b93d932a64db
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -58,18 +58,19 @@ public class NewGame : MonoBehaviour
PlayerPrefs.SetInt(SkillsPointsManger.PLAYER_SKILS_HEALTH_POINTS, 0); // healthPoints
PlayerPrefs.SetInt(SkillsPointsManger.PLAYER_SKILS_DEFENSE_POINTS, 0); // defensePoints
PlayerPrefs.SetInt(SkillsPointsManger.PLAYER_SKILS_STRENGHT_POINTS, 0); // StrengthPoints
PlayerPrefs.SetInt(SkillsPointsManger.PLAYER_SKILS_INTELIGENCE_POINTS, 0); // IntelligencePoints
// --------------------------------------------------------------------
//LETTER --------------------------------------------------------------
PlayerPrefs.SetInt("PrologueLetter.WhereDisplayed", 0);
// --------------------------------------------------------------------
//NPC ACTIONS HERE ----------------------------------------------------
// -> Wizard House
PlayerPrefs.SetInt(SkillsPointsManger.PLAYER_SKILS_INTELIGENCE_POINTS, 0); // IntelligencePoints
// --------------------------------------------------------------------
//LETTER --------------------------------------------------------------
PlayerPrefs.SetInt("PrologueLetter.WhereDisplayed", 0);
PlayerPrefs.SetInt("ControlLetter.WhereDisplayed", 0);
// --------------------------------------------------------------------
//NPC ACTIONS HERE ----------------------------------------------------
// -> Wizard House
PlayerPrefs.SetInt("Wizard.FirstDialogue", 0);
// --------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3418fe5e426fc4c42948b088a01cb622
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -37,7 +37,6 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -3.21, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4869648843387222761}
- {fileID: 4869648845035997474}
@ -63,7 +62,6 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -201,7 +199,7 @@ CircleCollider2D:
m_Radius: 0.38
--- !u!95 &4869648843286970677
Animator:
serializedVersion: 4
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -214,7 +212,6 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -318,7 +315,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 0
@ -330,19 +326,19 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4869648843387222766}
serializedVersion: 8
serializedVersion: 7
lengthInSec: 0.2
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@ -892,7 +888,6 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
maxNumParticles: 7
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
gravityModifier:
@ -5100,7 +5095,6 @@ ParticleSystemRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -5131,7 +5125,6 @@ ParticleSystemRenderer:
m_SortingLayer: 0
m_SortingOrder: 3
m_RenderMode: 3
m_MeshDistribution: 0
m_SortMode: 0
m_MinParticleSize: 0.1
m_MaxParticleSize: 0.5
@ -5155,10 +5148,6 @@ ParticleSystemRenderer:
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MeshWeighting: 1
m_MeshWeighting1: 1
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!1 &4869648843392866306
GameObject:
@ -5187,7 +5176,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 7
@ -5268,7 +5256,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 4
@ -5299,8 +5286,8 @@ PolygonCollider2D:
m_Points:
m_Paths:
- - {x: 0.46963263, y: 1.1943307}
- {x: 0.3174919, y: 1.0269614}
- {x: 0.3028978, y: 0.10865629}
- {x: -0.07384676, y: 1.059573}
- {x: -0.10474664, y: 0.027127385}
- {x: 0.4798239, y: -0.101868674}
- {x: 0.64798117, y: 0.025810182}
- {x: 0.6217737, y: 1.0539521}
@ -5331,7 +5318,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 5
@ -5361,12 +5347,12 @@ PolygonCollider2D:
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.18366286, y: -0.31947345}
- - {x: 0.07296342, y: -0.30177516}
- {x: -0.35872763, y: -0.2275629}
- {x: -0.5595645, y: -0.3193036}
- {x: -0.5491193, y: -1.1473438}
- {x: -0.36919522, y: -1.2923404}
- {x: -0.18958709, y: -1.1506201}
- {x: 0.09358674, y: -1.1506201}
--- !u!1 &4869648844605138519
GameObject:
m_ObjectHideFlags: 0
@ -5394,7 +5380,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 3
@ -5457,7 +5442,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 8
@ -5533,7 +5517,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 2
@ -5596,7 +5579,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 1
@ -5644,7 +5626,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 9
@ -5720,7 +5701,6 @@ Transform:
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: 4869648843286970699}
m_RootOrder: 6

View File

@ -11339,6 +11339,7 @@ GameObject:
- component: {fileID: 407612202}
- component: {fileID: 407612204}
- component: {fileID: 407612203}
- component: {fileID: 407612205}
m_Layer: 0
m_Name: Walls
m_TagString: Untagged
@ -14102,6 +14103,22 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!19719996 &407612205
TilemapCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 407612201}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!1 &425810218
GameObject:
m_ObjectHideFlags: 0
@ -16020,6 +16037,54 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &929531678
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 929531680}
- component: {fileID: 929531679}
m_Layer: 0
m_Name: OpenSettingsOnESCPress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &929531679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 929531678}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 400b7d04c7299834ba0e87f3d59aa2c2, type: 3}
m_Name:
m_EditorClassIdentifier:
SettingsMainPanel: {fileID: 1475557201}
SettingsPanel: {fileID: 1873963896}
SoundsPanel: {fileID: 1127174149}
ControlsPanel: {fileID: 2096156760}
LanguagePanel: {fileID: 337149900}
--- !u!4 &929531680
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 929531678}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &934145150
GameObject:
m_ObjectHideFlags: 0
@ -53108,6 +53173,8 @@ MonoBehaviour:
keyToOpen: 101
Elements: []
CurrentChestName:
OpenAfterDelay: 0
CloseAfterDelay: 0
--- !u!114 &1467027550
MonoBehaviour:
m_ObjectHideFlags: 0
@ -55285,7 +55352,6 @@ MonoBehaviour:
- {fileID: 4095674802650808536, guid: d4ed7b1b2a2b74b49966bd3fb39806ff, type: 3}
- {fileID: 2071044935318948575, guid: 4424631257fae904ca20d56e45a8fce1, type: 3}
- {fileID: 768066516210684488, guid: 37d53369a108ca64b8ec49414fe5b33f, type: 3}
- {fileID: 2368039485218444103, guid: ef9907b84e7629a4ea317ffe22da98dd, type: 3}
respownPoints:
- {fileID: 2083033195}
- {fileID: 1004268553}

View File

@ -183609,6 +183609,8 @@ MonoBehaviour:
keyToOpen: 101
Elements: []
CurrentChestName:
OpenAfterDelay: 0
CloseAfterDelay: 0
--- !u!114 &1288958690
MonoBehaviour:
m_ObjectHideFlags: 0
@ -221608,6 +221610,7 @@ GameObject:
m_Component:
- component: {fileID: 1564453899}
- component: {fileID: 1564453900}
- component: {fileID: 1564453901}
m_Layer: 0
m_Name: GUIManager
m_TagString: Untagged
@ -221643,6 +221646,20 @@ MonoBehaviour:
m_EditorClassIdentifier:
LetterPanel: {fileID: 8636999769331509921, guid: 1a1e7f9847ca9ab44ba833cd1ab3f5fa, type: 3}
_panel: {fileID: 0}
--- !u!114 &1564453901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1564453898}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 656bcb92d555a5648b47b93d932a64db, type: 3}
m_Name:
m_EditorClassIdentifier:
LetterPanel: {fileID: 8636999769331509921, guid: 3418fe5e426fc4c42948b088a01cb622, type: 3}
_panel: {fileID: 0}
--- !u!1 &1564617193
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a4346d5149b2f1a4f8c7821efbb5e4a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -573028,6 +573028,8 @@ MonoBehaviour:
keyToOpen: 101
Elements: []
CurrentChestName:
OpenAfterDelay: 0
CloseAfterDelay: 0
--- !u!114 &1734853909
MonoBehaviour:
m_ObjectHideFlags: 0
@ -579178,6 +579180,54 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1792411418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1792411420}
- component: {fileID: 1792411419}
m_Layer: 0
m_Name: OpenSettingsOnESCPress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1792411419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792411418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 400b7d04c7299834ba0e87f3d59aa2c2, type: 3}
m_Name:
m_EditorClassIdentifier:
SettingsMainPanel: {fileID: 1592086835}
SettingsPanel: {fileID: 1527461547}
SoundsPanel: {fileID: 1776968268}
ControlsPanel: {fileID: 1010779221}
LanguagePanel: {fileID: 1648926190}
--- !u!4 &1792411420
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792411418}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1792803895
GameObject:
m_ObjectHideFlags: 0

View File

@ -20800,6 +20800,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821554865}
m_CullTransparentMesh: 1
--- !u!1 &831536785
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 831536787}
- component: {fileID: 831536786}
m_Layer: 0
m_Name: OpenSettingsOnESCPress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &831536786
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831536785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 400b7d04c7299834ba0e87f3d59aa2c2, type: 3}
m_Name:
m_EditorClassIdentifier:
SettingsMainPanel: {fileID: 1946214773}
SettingsPanel: {fileID: 228588811}
SoundsPanel: {fileID: 1820105106}
ControlsPanel: {fileID: 630262873}
LanguagePanel: {fileID: 1608355680}
--- !u!4 &831536787
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831536785}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &847960744
GameObject:
m_ObjectHideFlags: 0
@ -28082,6 +28130,8 @@ MonoBehaviour:
keyToOpen: 101
Elements: []
CurrentChestName:
OpenAfterDelay: 0
CloseAfterDelay: 0
--- !u!114 &1732341612
MonoBehaviour:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 69001702ffc3307468ca42491ced18b5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -27973,6 +27973,54 @@ PolygonCollider2D:
- {x: -3.0303807, y: 2.1999774}
- {x: 1.0656848, y: 2.2176778}
- {x: 6.1194477, y: 2.1852138}
--- !u!1 &972772840
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 972772842}
- component: {fileID: 972772841}
m_Layer: 0
m_Name: OpenSettingsOnESCPress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &972772841
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972772840}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 400b7d04c7299834ba0e87f3d59aa2c2, type: 3}
m_Name:
m_EditorClassIdentifier:
SettingsMainPanel: {fileID: 350505632}
SettingsPanel: {fileID: 1111939639}
SoundsPanel: {fileID: 422014594}
ControlsPanel: {fileID: 984746019}
LanguagePanel: {fileID: 224657175}
--- !u!4 &972772842
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972772840}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &984746019
GameObject:
m_ObjectHideFlags: 0
@ -34667,6 +34715,8 @@ MonoBehaviour:
keyToOpen: 101
Elements: []
CurrentChestName:
OpenAfterDelay: 0
CloseAfterDelay: 0
--- !u!114 &1701466740
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -5,8 +5,6 @@ using UnityEngine.UI;
public class KeyBindScript : MonoBehaviour
{
/*
/// <summary>
/// This is the dictionary, that contains all our keybinds
/// </summary>
@ -33,7 +31,7 @@ public class KeyBindScript : MonoBehaviour
private Color32 slected = new Color32(239, 116, 36, 255);
// Use this for initialization
void Start()
void Start()
{
keys.Add("Interact",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Interact","E")));
keys.Add("Settings",(KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("Settings","Escape")));
@ -50,7 +48,7 @@ public class KeyBindScript : MonoBehaviour
}
/*
// Update is called once per frame
void Update()
{
@ -84,7 +82,7 @@ public class KeyBindScript : MonoBehaviour
}
}
}
}*/
void OnGUI()
{
if (currentKey != null) //If we have selected a key, that we want to edit
@ -129,6 +127,5 @@ public class KeyBindScript : MonoBehaviour
PlayerPrefs.Save();
}*/
}
}
}

View File

@ -105,7 +105,7 @@ public class NPCFollowing : MonoBehaviour
{
Debug.Log(Vector2.Distance(transform.position, homePosition));
Debug.Log(homePosition);
if (Vector2.Distance(transform.position, homePosition) > 0.05)
if (Vector2.Distance(transform.position, homePosition) > 0.95)
{
//transform.position = Vector2.MoveTowards(transform.position, homePosition, 2 * Time.deltaTime);
agent.point = homePosition;
@ -117,7 +117,8 @@ public class NPCFollowing : MonoBehaviour
}
else
{
anim.SetBool("isChasing", false);
anim.SetBool("isRunning", false);
anim.SetBool("TurnFront", false);
gameObject.GetComponent<NPC>().State = NPCStateEnum.Pending;
}
}

View File

@ -0,0 +1,83 @@
%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: FireL
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:
- curve:
- time: 0
value: {fileID: -3400922831012537295, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- time: 0.083333336
value: {fileID: -362808699246304422, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- time: 0.16666667
value: {fileID: -9205537952567978889, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- time: 0.25
value: {fileID: -3604836520324674020, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- time: 0.33333334
value: {fileID: -8497330398670640627, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- time: 0.41666666
value: {fileID: 7271693487827903819, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -3400922831012537295, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- {fileID: -362808699246304422, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- {fileID: -9205537952567978889, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- {fileID: -3604836520324674020, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- {fileID: -8497330398670640627, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
- {fileID: 7271693487827903819, guid: 0fc0db54efa4e094090566e6466474b6, type: 3}
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: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a1859361e19a0554cba5460b44ad167d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,83 @@
%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: FireR
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:
- curve:
- time: 0
value: {fileID: -1536859323965184970, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- time: 0.083333336
value: {fileID: 2236599662553789247, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- time: 0.16666667
value: {fileID: -3622066890831346110, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- time: 0.25
value: {fileID: -600793787656853388, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- time: 0.33333334
value: {fileID: 2509933621218658943, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- time: 0.41666666
value: {fileID: -7490015492083947407, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -1536859323965184970, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- {fileID: 2236599662553789247, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- {fileID: -3622066890831346110, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- {fileID: -600793787656853388, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- {fileID: 2509933621218658943, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
- {fileID: -7490015492083947407, guid: f3e1f2ce68322ae40be94315fbbadc23, type: 3}
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: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 48203791e98d5fb469e36b708b3f095d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,92 @@
%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: KlakonL
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:
- curve:
- time: 0
value: {fileID: -285563938835554220, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.083333336
value: {fileID: 3757347508850610662, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.16666667
value: {fileID: -4087351859967697859, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.25
value: {fileID: -6409193408093201027, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.33333334
value: {fileID: -3490611388958509624, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.41666666
value: {fileID: 588686311733604885, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.5
value: {fileID: 8971291935409711341, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.5833333
value: {fileID: 3520327538198131709, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- time: 0.6666667
value: {fileID: 1129666220833104895, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -285563938835554220, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: 3757347508850610662, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: -4087351859967697859, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: -6409193408093201027, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: -3490611388958509624, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: 588686311733604885, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: 8971291935409711341, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: 3520327538198131709, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
- {fileID: 1129666220833104895, guid: 047ffba1af2b90f43a7de7a8cc4cb77a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 70721c6185299084594b896c27a2b126
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,92 @@
%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: KlakonR
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:
- curve:
- time: 0
value: {fileID: 5377985194029862465, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.083333336
value: {fileID: -841813385497543819, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.16666667
value: {fileID: 2394339443036100218, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.25
value: {fileID: 7829480997106417061, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.33333334
value: {fileID: -4893598412200729330, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.41666666
value: {fileID: -8076283073277703594, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.5
value: {fileID: -7485705196313556171, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.5833333
value: {fileID: -1829787086316658588, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- time: 0.6666667
value: {fileID: 7181170766035057652, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 5377985194029862465, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: -841813385497543819, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: 2394339443036100218, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: 7829480997106417061, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: -4893598412200729330, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: -8076283073277703594, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: -7485705196313556171, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: -1829787086316658588, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
- {fileID: 7181170766035057652, guid: f439946bbcb9c94488aaa6154a4952e7, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e83b220a3e0073842adc48b2c4fbc1c8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,77 @@
%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: MaskL
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:
- curve:
- time: 0
value: {fileID: -6453054006594940269, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- time: 0.083333336
value: {fileID: -8684421949111539636, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- time: 0.16666667
value: {fileID: -2566265890474197718, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- time: 0.25
value: {fileID: 243608332460271638, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -6453054006594940269, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- {fileID: -8684421949111539636, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- {fileID: -2566265890474197718, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
- {fileID: 243608332460271638, guid: 430e12f10d4a88f41af8f4b06750b423, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bf72db3db25578e4f90672b34e725e94
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,77 @@
%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: MaskR
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:
- curve:
- time: 0
value: {fileID: -6246251811264298147, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- time: 0.083333336
value: {fileID: 8898044806469152285, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- time: 0.16666667
value: {fileID: 7522227701649245399, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- time: 0.25
value: {fileID: -9180194536849362823, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -6246251811264298147, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- {fileID: 8898044806469152285, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- {fileID: 7522227701649245399, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
- {fileID: -9180194536849362823, guid: 0ea0d13ebb448074cabc63f61c324c6d, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 21bb2b58d76526a46bdf9134ac033f9c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,80 @@
%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: SkullL
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:
- curve:
- time: 0
value: {fileID: -6881088130463728646, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- time: 0.083333336
value: {fileID: 2989742458106843329, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- time: 0.16666667
value: {fileID: 1715772534449484684, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- time: 0.25
value: {fileID: -2331704920973579822, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- time: 0.33333334
value: {fileID: -2961391017823444796, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -6881088130463728646, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- {fileID: 2989742458106843329, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- {fileID: 1715772534449484684, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- {fileID: -2331704920973579822, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
- {fileID: -2961391017823444796, guid: 3bab3bfd1bd579e439f009ce7181b775, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.41666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 279bae538e781c1468a074bff54ccceb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +1,22 @@
fileFormatVersion: 2
guid: d2e18f8a51433934db50add42207a319
TextureImporter:
internalIDToNameTable: []
internalIDToNameTable:
- first:
213: -8431687732119116764
second: SkullSmallCSide_0
- first:
213: 7245129813290100989
second: SkullSmallCSide_1
- first:
213: -2281277133398797221
second: SkullSmallCSide_2
- first:
213: 1013520640949375983
second: SkullSmallCSide_3
- first:
213: 4153344233704370384
second: SkullSmallCSide_4
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -32,7 +47,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@ -41,12 +56,12 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -68,7 +83,19 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@ -77,7 +104,112 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: SkullSmallCSide_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 424650e3ea0acfa80800000000000000
internalID: -8431687732119116764
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: SkullSmallCSide_1
rect:
serializedVersion: 2
x: 16
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: df8afb8cd2fdb8460800000000000000
internalID: 7245129813290100989
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: SkullSmallCSide_2
rect:
serializedVersion: 2
x: 32
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b541b8da8864750e0800000000000000
internalID: -2281277133398797221
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: SkullSmallCSide_3
rect:
serializedVersion: 2
x: 48
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fe3505037afb01e00800000000000000
internalID: 1013520640949375983
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: SkullSmallCSide_4
rect:
serializedVersion: 2
x: 64
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0d0bddf3394a3a930800000000000000
internalID: 4153344233704370384
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []

View File

@ -0,0 +1,80 @@
%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: sKULLr
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:
- curve:
- time: 0
value: {fileID: -8431687732119116764, guid: d2e18f8a51433934db50add42207a319, type: 3}
- time: 0.083333336
value: {fileID: 7245129813290100989, guid: d2e18f8a51433934db50add42207a319, type: 3}
- time: 0.16666667
value: {fileID: -2281277133398797221, guid: d2e18f8a51433934db50add42207a319, type: 3}
- time: 0.25
value: {fileID: 1013520640949375983, guid: d2e18f8a51433934db50add42207a319, type: 3}
- time: 0.33333334
value: {fileID: 4153344233704370384, guid: d2e18f8a51433934db50add42207a319, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -8431687732119116764, guid: d2e18f8a51433934db50add42207a319, type: 3}
- {fileID: 7245129813290100989, guid: d2e18f8a51433934db50add42207a319, type: 3}
- {fileID: -2281277133398797221, guid: d2e18f8a51433934db50add42207a319, type: 3}
- {fileID: 1013520640949375983, guid: d2e18f8a51433934db50add42207a319, type: 3}
- {fileID: 4153344233704370384, guid: d2e18f8a51433934db50add42207a319, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.41666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d48fceb0a602a0449b6de2e722f9ad71
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -47,4 +47,13 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/NewGame - Confirmation.unity
guid: 5a154444dad816d41b4e975d5866fd40
- enabled: 1
path: Assets/Scenes/Catacombs.unity
guid: 82ce5bf2f2f272c43b47777bf3d879e2
- enabled: 1
path: Assets/Scenes/FirstLabirynthCave.unity
guid: a4346d5149b2f1a4f8c7821efbb5e4a4
- enabled: 1
path: Assets/Scenes/SecondLabirynthCave.unity
guid: 69001702ffc3307468ca42491ced18b5
m_configObjects: {}

View File

@ -6,35 +6,35 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c72111f19352f223d667d6d0a123df6f23b34f1a923e7ee2e26
flags: 0
RecentlyUsedScenePath-1:
value: 200b1b3316501b4842040d290521103419001626232922236202182ac0e93a3cf1a817faf43f2b2f7631ec390a3b4f2afc031d12
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
flags: 0
RecentlyUsedScenePath-5:
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
flags: 0
RecentlyUsedScenePath-6:
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-7:
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
flags: 0
RecentlyUsedScenePath-8:
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c791904040c062d2a2f223427093bc1e1223dacf238e0f323
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6c151518162e002924393f301327eac3352ee7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0