diff --git a/Assets/Board.controller b/Assets/Board.controller deleted file mode 100644 index 23c98a3..0000000 --- a/Assets/Board.controller +++ /dev/null @@ -1,73 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Board - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 7729759191439412503} - 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} - m_EvaluateTransitionsOnStart: 1 ---- !u!1102 &641698361560772062 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: levitate - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 000da6c2a7fd05340a44e5127ed2a28e, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &7729759191439412503 -AnimatorStateMachine: - serializedVersion: 7 - 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: 641698361560772062} - m_Position: {x: 200, y: 0, 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: 641698361560772062} diff --git a/Assets/Scripts/Settings/Combinator.meta b/Assets/Data.meta similarity index 77% rename from Assets/Scripts/Settings/Combinator.meta rename to Assets/Data.meta index 92a09bb..2dd21de 100644 --- a/Assets/Scripts/Settings/Combinator.meta +++ b/Assets/Data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 565362d8d4b52e743a365f6ae5923405 +guid: 20f837d7ff5efdb45b54e8f65e6185c5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Characters/DifficultyPresets.meta b/Assets/Data/Difficulties.meta similarity index 100% rename from Assets/Characters/DifficultyPresets.meta rename to Assets/Data/Difficulties.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy.meta b/Assets/Data/Difficulties/1Easy.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy.meta rename to Assets/Data/Difficulties/1Easy.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM1_easy.asset b/Assets/Data/Difficulties/1Easy/1tosterM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM1_easy.asset rename to Assets/Data/Difficulties/1Easy/1tosterM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM1_easy.asset.meta b/Assets/Data/Difficulties/1Easy/1tosterM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM1_easy.asset.meta rename to Assets/Data/Difficulties/1Easy/1tosterM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM2_medium.asset b/Assets/Data/Difficulties/1Easy/1tosterM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM2_medium.asset rename to Assets/Data/Difficulties/1Easy/1tosterM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM2_medium.asset.meta b/Assets/Data/Difficulties/1Easy/1tosterM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM2_medium.asset.meta rename to Assets/Data/Difficulties/1Easy/1tosterM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM3_hard.asset b/Assets/Data/Difficulties/1Easy/1tosterM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM3_hard.asset rename to Assets/Data/Difficulties/1Easy/1tosterM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/1tosterM3_hard.asset.meta b/Assets/Data/Difficulties/1Easy/1tosterM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/1tosterM3_hard.asset.meta rename to Assets/Data/Difficulties/1Easy/1tosterM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM1_easy.asset b/Assets/Data/Difficulties/1Easy/2tamaM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM1_easy.asset rename to Assets/Data/Difficulties/1Easy/2tamaM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM1_easy.asset.meta b/Assets/Data/Difficulties/1Easy/2tamaM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM1_easy.asset.meta rename to Assets/Data/Difficulties/1Easy/2tamaM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM2_medium.asset b/Assets/Data/Difficulties/1Easy/2tamaM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM2_medium.asset rename to Assets/Data/Difficulties/1Easy/2tamaM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM2_medium.asset.meta b/Assets/Data/Difficulties/1Easy/2tamaM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM2_medium.asset.meta rename to Assets/Data/Difficulties/1Easy/2tamaM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM3_hard.asset b/Assets/Data/Difficulties/1Easy/2tamaM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM3_hard.asset rename to Assets/Data/Difficulties/1Easy/2tamaM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/2tamaM3_hard.asset.meta b/Assets/Data/Difficulties/1Easy/2tamaM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/2tamaM3_hard.asset.meta rename to Assets/Data/Difficulties/1Easy/2tamaM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM1_easy.asset b/Assets/Data/Difficulties/1Easy/3doggyM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM1_easy.asset rename to Assets/Data/Difficulties/1Easy/3doggyM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM1_easy.asset.meta b/Assets/Data/Difficulties/1Easy/3doggyM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM1_easy.asset.meta rename to Assets/Data/Difficulties/1Easy/3doggyM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM2_medium.asset b/Assets/Data/Difficulties/1Easy/3doggyM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM2_medium.asset rename to Assets/Data/Difficulties/1Easy/3doggyM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM2_medium.asset.meta b/Assets/Data/Difficulties/1Easy/3doggyM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM2_medium.asset.meta rename to Assets/Data/Difficulties/1Easy/3doggyM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM3_hard.asset b/Assets/Data/Difficulties/1Easy/3doggyM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM3_hard.asset rename to Assets/Data/Difficulties/1Easy/3doggyM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/3doggyM3_hard.asset.meta b/Assets/Data/Difficulties/1Easy/3doggyM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/3doggyM3_hard.asset.meta rename to Assets/Data/Difficulties/1Easy/3doggyM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM1_easy.asset b/Assets/Data/Difficulties/1Easy/4samuraiM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM1_easy.asset rename to Assets/Data/Difficulties/1Easy/4samuraiM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM1_easy.asset.meta b/Assets/Data/Difficulties/1Easy/4samuraiM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM1_easy.asset.meta rename to Assets/Data/Difficulties/1Easy/4samuraiM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM2_medium.asset b/Assets/Data/Difficulties/1Easy/4samuraiM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM2_medium.asset rename to Assets/Data/Difficulties/1Easy/4samuraiM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM2_medium.asset.meta b/Assets/Data/Difficulties/1Easy/4samuraiM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM2_medium.asset.meta rename to Assets/Data/Difficulties/1Easy/4samuraiM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM3_hard.asset b/Assets/Data/Difficulties/1Easy/4samuraiM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM3_hard.asset rename to Assets/Data/Difficulties/1Easy/4samuraiM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/4samuraiM3_hard.asset.meta b/Assets/Data/Difficulties/1Easy/4samuraiM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/4samuraiM3_hard.asset.meta rename to Assets/Data/Difficulties/1Easy/4samuraiM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/1Easy/5mistressM3_hard.asset b/Assets/Data/Difficulties/1Easy/5mistressM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/5mistressM3_hard.asset rename to Assets/Data/Difficulties/1Easy/5mistressM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/1Easy/5mistressM3_hard.asset.meta b/Assets/Data/Difficulties/1Easy/5mistressM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/1Easy/5mistressM3_hard.asset.meta rename to Assets/Data/Difficulties/1Easy/5mistressM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium.meta b/Assets/Data/Difficulties/2Medium.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium.meta rename to Assets/Data/Difficulties/2Medium.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM1_easy.asset b/Assets/Data/Difficulties/2Medium/1tosterM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM1_easy.asset rename to Assets/Data/Difficulties/2Medium/1tosterM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM1_easy.asset.meta b/Assets/Data/Difficulties/2Medium/1tosterM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM1_easy.asset.meta rename to Assets/Data/Difficulties/2Medium/1tosterM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM2_medium.asset b/Assets/Data/Difficulties/2Medium/1tosterM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM2_medium.asset rename to Assets/Data/Difficulties/2Medium/1tosterM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM2_medium.asset.meta b/Assets/Data/Difficulties/2Medium/1tosterM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM2_medium.asset.meta rename to Assets/Data/Difficulties/2Medium/1tosterM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM3_hard.asset b/Assets/Data/Difficulties/2Medium/1tosterM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM3_hard.asset rename to Assets/Data/Difficulties/2Medium/1tosterM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/1tosterM3_hard.asset.meta b/Assets/Data/Difficulties/2Medium/1tosterM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/1tosterM3_hard.asset.meta rename to Assets/Data/Difficulties/2Medium/1tosterM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM1_easy.asset b/Assets/Data/Difficulties/2Medium/2tamaM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM1_easy.asset rename to Assets/Data/Difficulties/2Medium/2tamaM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM1_easy.asset.meta b/Assets/Data/Difficulties/2Medium/2tamaM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM1_easy.asset.meta rename to Assets/Data/Difficulties/2Medium/2tamaM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM2_medium.asset b/Assets/Data/Difficulties/2Medium/2tamaM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM2_medium.asset rename to Assets/Data/Difficulties/2Medium/2tamaM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM2_medium.asset.meta b/Assets/Data/Difficulties/2Medium/2tamaM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM2_medium.asset.meta rename to Assets/Data/Difficulties/2Medium/2tamaM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM3_hard.asset b/Assets/Data/Difficulties/2Medium/2tamaM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM3_hard.asset rename to Assets/Data/Difficulties/2Medium/2tamaM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/2tamaM3_hard.asset.meta b/Assets/Data/Difficulties/2Medium/2tamaM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/2tamaM3_hard.asset.meta rename to Assets/Data/Difficulties/2Medium/2tamaM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM1_easy.asset b/Assets/Data/Difficulties/2Medium/3doggyM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM1_easy.asset rename to Assets/Data/Difficulties/2Medium/3doggyM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM1_easy.asset.meta b/Assets/Data/Difficulties/2Medium/3doggyM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM1_easy.asset.meta rename to Assets/Data/Difficulties/2Medium/3doggyM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM2_medium.asset b/Assets/Data/Difficulties/2Medium/3doggyM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM2_medium.asset rename to Assets/Data/Difficulties/2Medium/3doggyM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM2_medium.asset.meta b/Assets/Data/Difficulties/2Medium/3doggyM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM2_medium.asset.meta rename to Assets/Data/Difficulties/2Medium/3doggyM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM3_hard.asset b/Assets/Data/Difficulties/2Medium/3doggyM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM3_hard.asset rename to Assets/Data/Difficulties/2Medium/3doggyM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/3doggyM3_hard.asset.meta b/Assets/Data/Difficulties/2Medium/3doggyM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/3doggyM3_hard.asset.meta rename to Assets/Data/Difficulties/2Medium/3doggyM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM1_easy.asset b/Assets/Data/Difficulties/2Medium/4samuraiM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM1_easy.asset rename to Assets/Data/Difficulties/2Medium/4samuraiM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM1_easy.asset.meta b/Assets/Data/Difficulties/2Medium/4samuraiM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM1_easy.asset.meta rename to Assets/Data/Difficulties/2Medium/4samuraiM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM2_medium.asset b/Assets/Data/Difficulties/2Medium/4samuraiM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM2_medium.asset rename to Assets/Data/Difficulties/2Medium/4samuraiM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM2_medium.asset.meta b/Assets/Data/Difficulties/2Medium/4samuraiM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM2_medium.asset.meta rename to Assets/Data/Difficulties/2Medium/4samuraiM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM3_hard.asset b/Assets/Data/Difficulties/2Medium/4samuraiM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM3_hard.asset rename to Assets/Data/Difficulties/2Medium/4samuraiM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/4samuraiM3_hard.asset.meta b/Assets/Data/Difficulties/2Medium/4samuraiM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/4samuraiM3_hard.asset.meta rename to Assets/Data/Difficulties/2Medium/4samuraiM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/2Medium/5mistressM3_hard.asset b/Assets/Data/Difficulties/2Medium/5mistressM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/5mistressM3_hard.asset rename to Assets/Data/Difficulties/2Medium/5mistressM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/2Medium/5mistressM3_hard.asset.meta b/Assets/Data/Difficulties/2Medium/5mistressM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/2Medium/5mistressM3_hard.asset.meta rename to Assets/Data/Difficulties/2Medium/5mistressM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard.meta b/Assets/Data/Difficulties/3Hard.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard.meta rename to Assets/Data/Difficulties/3Hard.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM1_easy.asset b/Assets/Data/Difficulties/3Hard/1tosterM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM1_easy.asset rename to Assets/Data/Difficulties/3Hard/1tosterM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM1_easy.asset.meta b/Assets/Data/Difficulties/3Hard/1tosterM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM1_easy.asset.meta rename to Assets/Data/Difficulties/3Hard/1tosterM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM2_medium.asset b/Assets/Data/Difficulties/3Hard/1tosterM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM2_medium.asset rename to Assets/Data/Difficulties/3Hard/1tosterM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM2_medium.asset.meta b/Assets/Data/Difficulties/3Hard/1tosterM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM2_medium.asset.meta rename to Assets/Data/Difficulties/3Hard/1tosterM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM3_hard.asset b/Assets/Data/Difficulties/3Hard/1tosterM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM3_hard.asset rename to Assets/Data/Difficulties/3Hard/1tosterM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/1tosterM3_hard.asset.meta b/Assets/Data/Difficulties/3Hard/1tosterM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/1tosterM3_hard.asset.meta rename to Assets/Data/Difficulties/3Hard/1tosterM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM1_easy.asset b/Assets/Data/Difficulties/3Hard/2tamaM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM1_easy.asset rename to Assets/Data/Difficulties/3Hard/2tamaM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM1_easy.asset.meta b/Assets/Data/Difficulties/3Hard/2tamaM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM1_easy.asset.meta rename to Assets/Data/Difficulties/3Hard/2tamaM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM2_medium.asset b/Assets/Data/Difficulties/3Hard/2tamaM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM2_medium.asset rename to Assets/Data/Difficulties/3Hard/2tamaM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM2_medium.asset.meta b/Assets/Data/Difficulties/3Hard/2tamaM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM2_medium.asset.meta rename to Assets/Data/Difficulties/3Hard/2tamaM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM3_hard.asset b/Assets/Data/Difficulties/3Hard/2tamaM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM3_hard.asset rename to Assets/Data/Difficulties/3Hard/2tamaM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/2tamaM3_hard.asset.meta b/Assets/Data/Difficulties/3Hard/2tamaM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/2tamaM3_hard.asset.meta rename to Assets/Data/Difficulties/3Hard/2tamaM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM1_easy.asset b/Assets/Data/Difficulties/3Hard/3doggyM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM1_easy.asset rename to Assets/Data/Difficulties/3Hard/3doggyM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM1_easy.asset.meta b/Assets/Data/Difficulties/3Hard/3doggyM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM1_easy.asset.meta rename to Assets/Data/Difficulties/3Hard/3doggyM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM2_medium.asset b/Assets/Data/Difficulties/3Hard/3doggyM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM2_medium.asset rename to Assets/Data/Difficulties/3Hard/3doggyM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM2_medium.asset.meta b/Assets/Data/Difficulties/3Hard/3doggyM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM2_medium.asset.meta rename to Assets/Data/Difficulties/3Hard/3doggyM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM3_hard.asset b/Assets/Data/Difficulties/3Hard/3doggyM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM3_hard.asset rename to Assets/Data/Difficulties/3Hard/3doggyM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/3doggyM3_hard.asset.meta b/Assets/Data/Difficulties/3Hard/3doggyM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/3doggyM3_hard.asset.meta rename to Assets/Data/Difficulties/3Hard/3doggyM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM1_easy.asset b/Assets/Data/Difficulties/3Hard/4samuraiM1_easy.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM1_easy.asset rename to Assets/Data/Difficulties/3Hard/4samuraiM1_easy.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM1_easy.asset.meta b/Assets/Data/Difficulties/3Hard/4samuraiM1_easy.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM1_easy.asset.meta rename to Assets/Data/Difficulties/3Hard/4samuraiM1_easy.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM2_medium.asset b/Assets/Data/Difficulties/3Hard/4samuraiM2_medium.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM2_medium.asset rename to Assets/Data/Difficulties/3Hard/4samuraiM2_medium.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM2_medium.asset.meta b/Assets/Data/Difficulties/3Hard/4samuraiM2_medium.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM2_medium.asset.meta rename to Assets/Data/Difficulties/3Hard/4samuraiM2_medium.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM3_hard.asset b/Assets/Data/Difficulties/3Hard/4samuraiM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM3_hard.asset rename to Assets/Data/Difficulties/3Hard/4samuraiM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/4samuraiM3_hard.asset.meta b/Assets/Data/Difficulties/3Hard/4samuraiM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/4samuraiM3_hard.asset.meta rename to Assets/Data/Difficulties/3Hard/4samuraiM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/3Hard/5mistressM3_hard.asset b/Assets/Data/Difficulties/3Hard/5mistressM3_hard.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/5mistressM3_hard.asset rename to Assets/Data/Difficulties/3Hard/5mistressM3_hard.asset diff --git a/Assets/Characters/DifficultyPresets/3Hard/5mistressM3_hard.asset.meta b/Assets/Data/Difficulties/3Hard/5mistressM3_hard.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/3Hard/5mistressM3_hard.asset.meta rename to Assets/Data/Difficulties/3Hard/5mistressM3_hard.asset.meta diff --git a/Assets/Characters/DifficultyPresets/DUMMY.asset b/Assets/Data/Difficulties/DUMMY.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/DUMMY.asset rename to Assets/Data/Difficulties/DUMMY.asset diff --git a/Assets/Characters/DifficultyPresets/DUMMY.asset.meta b/Assets/Data/Difficulties/DUMMY.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/DUMMY.asset.meta rename to Assets/Data/Difficulties/DUMMY.asset.meta diff --git a/Assets/Characters/DifficultyPresets/additional.asset b/Assets/Data/Difficulties/additional.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/additional.asset rename to Assets/Data/Difficulties/additional.asset diff --git a/Assets/Characters/DifficultyPresets/additional.asset.meta b/Assets/Data/Difficulties/additional.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/additional.asset.meta rename to Assets/Data/Difficulties/additional.asset.meta diff --git a/Assets/Characters/DifficultyPresets/draw.asset b/Assets/Data/Difficulties/draw.asset similarity index 100% rename from Assets/Characters/DifficultyPresets/draw.asset rename to Assets/Data/Difficulties/draw.asset diff --git a/Assets/Characters/DifficultyPresets/draw.asset.meta b/Assets/Data/Difficulties/draw.asset.meta similarity index 100% rename from Assets/Characters/DifficultyPresets/draw.asset.meta rename to Assets/Data/Difficulties/draw.asset.meta diff --git a/Assets/Scripts/Settings/Descriptions.meta b/Assets/Data/Settings.meta similarity index 77% rename from Assets/Scripts/Settings/Descriptions.meta rename to Assets/Data/Settings.meta index db65ee9..3be8579 100644 --- a/Assets/Scripts/Settings/Descriptions.meta +++ b/Assets/Data/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 412f30e050570114a85aa966b6653cfb +guid: 8868a2fcc253b4a4aade9b4c2db4a13a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Data/Settings/SettingsScheme.asset b/Assets/Data/Settings/SettingsScheme.asset new file mode 100644 index 0000000..00f4517 --- /dev/null +++ b/Assets/Data/Settings/SettingsScheme.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a114b7be96b4d264d8ea2198bfeca5e4, type: 3} + m_Name: SettingsScheme + m_EditorClassIdentifier: Assembly-CSharp::SettingsScheme + groups: + - {fileID: 11400000, guid: 1c73c142bf630ca47af1439dc290d146, type: 2} + - {fileID: 11400000, guid: a6ac7ec635a165342ad3fcff513a9a05, type: 2} + - {fileID: 11400000, guid: 2ad4de38002e49f4c934d10f12ef6536, type: 2} + - {fileID: 11400000, guid: 31a73d65bb1d73a47b7f9b10b0cb9fc0, type: 2} + - {fileID: 11400000, guid: d1e86602ba41e3e4fa8694b8018f9234, type: 2} + - {fileID: 11400000, guid: 87a606b5a05c5bf488d6a4ab007d8567, type: 2} + - {fileID: 11400000, guid: 1394b74f97fe4cf45adbce69982eb8bd, type: 2} diff --git a/Assets/levitate.anim.meta b/Assets/Data/Settings/SettingsScheme.asset.meta similarity index 64% rename from Assets/levitate.anim.meta rename to Assets/Data/Settings/SettingsScheme.asset.meta index bd8d69e..e075061 100644 --- a/Assets/levitate.anim.meta +++ b/Assets/Data/Settings/SettingsScheme.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 000da6c2a7fd05340a44e5127ed2a28e +guid: b0b04f5868cf5024aa52cb64831e32b9 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 7400000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Common/Server.meta b/Assets/Data/Settings/Быстрые проверки.meta similarity index 77% rename from Assets/Scripts/Common/Server.meta rename to Assets/Data/Settings/Быстрые проверки.meta index b9b99e1..07dff28 100644 --- a/Assets/Scripts/Common/Server.meta +++ b/Assets/Data/Settings/Быстрые проверки.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71712fc6163b93c499a666da48868760 +guid: 2c1f52e798a21ff42b8dd7feadf9fe58 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset b/Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset new file mode 100644 index 0000000..d7c1821 --- /dev/null +++ b/Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u0411\u044B\u0441\u0442\u0440\u044B\u0435 + \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: + IconPath: + Settings: [] diff --git a/Assets/Board.controller.meta b/Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset.meta similarity index 64% rename from Assets/Board.controller.meta rename to Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset.meta index d082412..aecbf5d 100644 --- a/Assets/Board.controller.meta +++ b/Assets/Data/Settings/Быстрые проверки/_Группа Быстрые проверки.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 749b7900f7939604b86a732d7c66a87e +guid: 87a606b5a05c5bf488d6a4ab007d8567 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 9100000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset new file mode 100644 index 0000000..96d2189 --- /dev/null +++ b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0411\u044B\u0441\u0442\u0440\u0430\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 + \u043F\u0440\u0438\u0437\u043E\u0432" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: FastCheckPrizes + Alias: "\u0411\u044B\u0441\u0442\u0440\u0430\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 + \u043F\u0440\u0438\u0437\u043E\u0432" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab.meta b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset.meta similarity index 52% rename from Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab.meta rename to Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset.meta index 04bc5a1..373b252 100644 --- a/Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab.meta +++ b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка призов.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: e2dfd095ac158024d90effe99a4877d0 -PrefabImporter: +guid: 702bd7848bbf3b546a460c227892f236 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset new file mode 100644 index 0000000..8ffed7a --- /dev/null +++ b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0411\u044B\u0441\u0442\u0440\u0430\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 + \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u043E\u0432" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: FastCheck + Alias: "\u0411\u044B\u0441\u0442\u0440\u0430\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 + \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u043E\u0432" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset.meta b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset.meta new file mode 100644 index 0000000..23ec6df --- /dev/null +++ b/Assets/Data/Settings/Быстрые проверки/Быстрая проверка счетчиков.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a9d6fdd1cdb0e84097d35b76d169cd8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions.meta b/Assets/Data/Settings/Звук и озвучка.meta similarity index 77% rename from Assets/Scripts/Settings/Descriptions/Actions descriptions.meta rename to Assets/Data/Settings/Звук и озвучка.meta index eb61dd4..6a1d757 100644 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions.meta +++ b/Assets/Data/Settings/Звук и озвучка.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00dfadd028b63d14ea5c7f8ddfdee1d4 +guid: 0f4166f7ee731b949a1144bd7166dde0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset b/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset new file mode 100644 index 0000000..1d177e0 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u0417\u0432\u0443\u043A" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: "\u0417\u0432\u0443\u043A \u0438 \u043E\u0437\u0432\u0443\u0447\u043A\u0430" + IconPath: + Settings: + - {fileID: 11400000, guid: 83156434a0ce74e438776da1b5c10268, type: 2} + - {fileID: 11400000, guid: e2f55590a08217b43befd267877e3756, type: 2} + - {fileID: 11400000, guid: cbf5292a949a44845bde240b1e3b43c8, type: 2} diff --git a/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset.meta b/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset.meta new file mode 100644 index 0000000..7e4f9c6 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/_Группа Звук.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c73c142bf630ca47af1439dc290d146 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset b/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset new file mode 100644 index 0000000..591335c --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u043C\u0443\u0437\u044B\u043A\u0438" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 1 + Id: MusicVolume + Alias: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u043C\u0443\u0437\u044B\u043A\u0438" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0.5 + FloatMin: 0 + FloatMax: 1 + FloatStep: 0.01 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset.meta b/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset.meta new file mode 100644 index 0000000..d23f885 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость музыки.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83156434a0ce74e438776da1b5c10268 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset b/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset new file mode 100644 index 0000000..0509105 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u043F\u0440\u043E\u043C\u043E + \u0440\u043E\u043B\u0438\u043A\u0430" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 1 + Id: PromoVolume + Alias: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u043F\u0440\u043E\u043C\u043E + \u0440\u043E\u043B\u0438\u043A\u0430" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0.5 + FloatMin: 0 + FloatMax: 1 + FloatStep: 0.01 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset.meta b/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset.meta new file mode 100644 index 0000000..4d4d284 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость промо ролика.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbf5292a949a44845bde240b1e3b43c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset b/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset new file mode 100644 index 0000000..d12d785 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u044D\u0444\u0444\u0435\u043A\u0442\u043E\u0432" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 1 + Id: SoundsVolume + Alias: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u044D\u0444\u0444\u0435\u043A\u0442\u043E\u0432" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0.5 + FloatMin: 0 + FloatMax: 1 + FloatStep: 0.01 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset.meta b/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset.meta new file mode 100644 index 0000000..1a1b524 --- /dev/null +++ b/Assets/Data/Settings/Звук и озвучка/Громкость эффектов.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2f55590a08217b43befd267877e3756 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Игровой процесс.meta b/Assets/Data/Settings/Игровой процесс.meta new file mode 100644 index 0000000..fae1404 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f81852bbf1c0ea45b2ca0eb73a5e966 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Игровой процесс/_Группа игра.asset b/Assets/Data/Settings/Игровой процесс/_Группа игра.asset new file mode 100644 index 0000000..a3b1a23 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/_Группа игра.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u0438\u0433\u0440\u0430" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: "\u0418\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441" + IconPath: + Settings: + - {fileID: 11400000, guid: 527bfcd8808cbd94e9b9ed391767e9e5, type: 2} + - {fileID: 11400000, guid: b7282f26a4faa404abeaf16c908565d2, type: 2} + - {fileID: 11400000, guid: 60aaddb0e514bfb4e89fd23ea4ce6435, type: 2} diff --git a/Assets/Data/Settings/Игровой процесс/_Группа игра.asset.meta b/Assets/Data/Settings/Игровой процесс/_Группа игра.asset.meta new file mode 100644 index 0000000..b6c7b2f --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/_Группа игра.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31a73d65bb1d73a47b7f9b10b0cb9fc0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Игровой процесс/Выдача призов.asset b/Assets/Data/Settings/Игровой процесс/Выдача призов.asset new file mode 100644 index 0000000..e64d356 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Выдача призов.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u044B\u0434\u0430\u0447\u0430 \u043F\u0440\u0438\u0437\u043E\u0432" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: Prizing + Alias: "\u0412\u044B\u0434\u0430\u0447\u0430 \u043F\u0440\u0438\u0437\u043E\u0432" + Description: + BoolValue: 1 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Игровой процесс/Выдача призов.asset.meta b/Assets/Data/Settings/Игровой процесс/Выдача призов.asset.meta new file mode 100644 index 0000000..bf7a5b6 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Выдача призов.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7282f26a4faa404abeaf16c908565d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset b/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset new file mode 100644 index 0000000..e927f69 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0420\u0435\u0436\u0438\u043C \u0430\u043F\u043F\u0430\u0440\u0430\u0442\u0430" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 2 + Id: DifficultyMode + Alias: "\u0420\u0435\u0436\u0438\u043C \u0430\u043F\u043F\u0430\u0440\u0430\u0442\u0430" + Description: "\u041F\u0440\u043E\u0445\u043E\u0436\u0434\u0435\u043D\u0438\u0435: + \u043F\u043E\u043A\u0430 \u043D\u0435 \u043F\u043E\u0431\u0435\u0434\u0438\u043B\u0438 + \u0444\u0438\u043D\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0431\u043E\u0441\u0441\u0430, + \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A\u0430\u043A \u0432 + \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0435 \"\u0421\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u044C\". + \u041F\u043E\u0441\u043B\u0435 \u043F\u043E\u0431\u0435\u0434\u044B \u043F\u0435\u0440\u0435\u0445\u043E\u0434\u0438\u0442 + \u0432 \u0440\u0435\u0436\u0438\u043C \"\u0417\u0430\u0440\u0430\u0431\u043E\u0442\u043E\u043A\".\n\r\n\u0417\u0430\u0440\u0430\u0431\u043E\u0442\u043E\u043A: + \u0431\u043E\u0442\u044B \u043D\u0430 \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0439 + \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438. \u041A\u0430\u043A \u0442\u043E\u043B\u044C\u043A\u043E + \u043D\u0430\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u043E + \u043E\u043F\u043B\u0430\u0442, \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0430\u0435\u0442\u0441\u044F + \u0432 \u0440\u0435\u0436\u0438\u043C \"\u041F\u0440\u043E\u0445\u043E\u0436\u0434\u0435\u043D\u0438\u0435\".\n\r\n\u0424\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439: + \u0430\u0432\u0442\u043E\u043F\u043E\u0434\u043C\u0435\u043D\u0430 \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438 + \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430." + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: "\u0424\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439" + AllowedValues: + - "\u041F\u0440\u043E\u0445\u043E\u0436\u0434\u0435\u043D\u0438\u0435" + - "\u0417\u0430\u0440\u0430\u0431\u043E\u0442\u043E\u043A" + - "\u0424\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439" + SignalValue: diff --git a/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset.meta b/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset.meta new file mode 100644 index 0000000..717e5e9 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Режим аппарата.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 527bfcd8808cbd94e9b9ed391767e9e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Игровой процесс/Сложность.asset b/Assets/Data/Settings/Игровой процесс/Сложность.asset new file mode 100644 index 0000000..60ba8b2 --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Сложность.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0421\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u044C" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 2 + Id: Difficulty + Alias: "\u0421\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u044C" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: "\u0421\u0440\u0435\u0434\u043D\u044F\u044F" + AllowedValues: + - "\u041B\u0435\u0433\u043A\u0430\u044F" + - "\u0421\u0440\u0435\u0434\u043D\u044F\u044F" + - "\u0421\u043B\u043E\u0436\u043D\u0430\u044F" + SignalValue: diff --git a/Assets/Data/Settings/Игровой процесс/Сложность.asset.meta b/Assets/Data/Settings/Игровой процесс/Сложность.asset.meta new file mode 100644 index 0000000..c785ecd --- /dev/null +++ b/Assets/Data/Settings/Игровой процесс/Сложность.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60aaddb0e514bfb4e89fd23ea4ce6435 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Контакты и поддержка.meta b/Assets/Data/Settings/Контакты и поддержка.meta new file mode 100644 index 0000000..8df6e81 --- /dev/null +++ b/Assets/Data/Settings/Контакты и поддержка.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36feb6b4cfcfb0447b0ea47e6f2bf23b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset b/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset new file mode 100644 index 0000000..7c1dd02 --- /dev/null +++ b/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: "\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B" + IconPath: + Settings: + - {fileID: 11400000, guid: 53ca4e5cdc83fdc49a6e33ac044387f4, type: 2} diff --git a/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset.meta b/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset.meta new file mode 100644 index 0000000..a2e6124 --- /dev/null +++ b/Assets/Data/Settings/Контакты и поддержка/_Группа Контакты.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1e86602ba41e3e4fa8694b8018f9234 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset b/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset new file mode 100644 index 0000000..e7247a7 --- /dev/null +++ b/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u044B + \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: ShowNumber + Alias: "\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043D\u043E\u043C\u0435\u0440 + \u0442\u0435\u0445\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438" + Description: + BoolValue: 1 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset.meta b/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset.meta new file mode 100644 index 0000000..be95bf2 --- /dev/null +++ b/Assets/Data/Settings/Контакты и поддержка/Показывать контакты администрации.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53ca4e5cdc83fdc49a6e33ac044387f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены.meta b/Assets/Data/Settings/Оплата и цены.meta new file mode 100644 index 0000000..228efc8 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d85c9ab8cbaba043b7925d4e0af3815 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset b/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset new file mode 100644 index 0000000..1fc3552 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u043E\u043F\u043B\u0430\u0442\u0430 + \u0438 \u0446\u0435\u043D\u044B" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: + IconPath: + Settings: + - {fileID: 11400000, guid: f6cb3f6e6360b6f4eb4a21b58b3be88c, type: 2} diff --git a/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset.meta b/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset.meta new file mode 100644 index 0000000..189122f --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/_Группа оплата и цены.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6ac7ec635a165342ad3fcff513a9a05 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset b/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset new file mode 100644 index 0000000..7e3dff8 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0411\u0435\u0441\u043F\u043B\u0430\u0442\u043D\u0430\u044F \u0438\u0433\u0440\u0430" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: Freeplay + Alias: "\u0411\u0435\u0441\u043F\u043B\u0430\u0442\u043D\u0430\u044F \u0438\u0433\u0440\u0430" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset.meta b/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset.meta new file mode 100644 index 0000000..c1954a3 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Бесплатная игра.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6cb3f6e6360b6f4eb4a21b58b3be88c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены/Цена PVE.asset b/Assets/Data/Settings/Оплата и цены/Цена PVE.asset new file mode 100644 index 0000000..cafa3cc --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена PVE.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0426\u0435\u043D\u0430 PVE" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 0 + Id: PricePve + Alias: "\u0426\u0435\u043D\u0430 \u0441 \u0431\u043E\u0442\u043E\u043C" + Description: + BoolValue: 0 + IntValue: 10 + IntMin: 1 + IntMax: 9999 + IntStep: 1 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Оплата и цены/Цена PVE.asset.meta b/Assets/Data/Settings/Оплата и цены/Цена PVE.asset.meta new file mode 100644 index 0000000..179c97a --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена PVE.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6205259486b86ff42bfbae0d873a6c8f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены/Цена PVP.asset b/Assets/Data/Settings/Оплата и цены/Цена PVP.asset new file mode 100644 index 0000000..36dc5a4 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена PVP.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0426\u0435\u043D\u0430 PVP" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 0 + Id: PricePvp + Alias: "\u0426\u0435\u043D\u0430 \u043D\u0430 \u0434\u0432\u043E\u0438\u0445" + Description: + BoolValue: 0 + IntValue: 10 + IntMin: 1 + IntMax: 9999 + IntStep: 1 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Оплата и цены/Цена PVP.asset.meta b/Assets/Data/Settings/Оплата и цены/Цена PVP.asset.meta new file mode 100644 index 0000000..608647a --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена PVP.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51ca61689e0784e4baee7d846ffe3562 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset b/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset new file mode 100644 index 0000000..8c709d3 --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0426\u0435\u043D\u0430 Revenge" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 0 + Id: PricePvp + Alias: "\u0426\u0435\u043D\u0430 \u043D\u0430 \u0434\u0432\u043E\u0438\u0445" + Description: + BoolValue: 0 + IntValue: 10 + IntMin: 1 + IntMax: 9999 + IntStep: 1 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset.meta b/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset.meta new file mode 100644 index 0000000..fc54a7a --- /dev/null +++ b/Assets/Data/Settings/Оплата и цены/Цена Revenge.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23af4d6057647cf44b8ddc429718ab84 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача.meta b/Assets/Data/Settings/Призы и выдача.meta new file mode 100644 index 0000000..d131156 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71a36039415a0b944b2bba21c1ea6ee0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset b/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset new file mode 100644 index 0000000..9414bd0 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u0432\u044B\u0434\u0430\u0447\u0430" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" + IconPath: + Settings: + - {fileID: 11400000, guid: 69caee1bef041a840927c91f50cd07d3, type: 2} + - {fileID: 11400000, guid: 1e1bc312a6cfdbf4680c1e3b31a04795, type: 2} + - {fileID: 11400000, guid: 0a123ff973e1ed74bb6cc6602897592a, type: 2} + - {fileID: 11400000, guid: ff6ba1e5433e65f42b32e699881216df, type: 2} diff --git a/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset.meta b/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset.meta new file mode 100644 index 0000000..4ea54bc --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/_Группа выдача.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ad4de38002e49f4c934d10f12ef6536 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset b/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset new file mode 100644 index 0000000..74fcb73 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u044B\u0432\u043E\u0434 \u043E\u0448\u0438\u0431\u043A\u0438 \u0432\u044B\u0434\u0430\u0447\u0438 + \u0432 \u043C\u0435\u043D\u044E" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: DisplayPrizingError + Alias: "\u0412\u044B\u0432\u043E\u0434 \u043E\u0448\u0438\u0431\u043A\u0438 \u0432\u044B\u0434\u0430\u0447\u0438 + \u0432 \u043C\u0435\u043D\u044E" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset.meta b/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset.meta new file mode 100644 index 0000000..33f004a --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Вывод ошибки выдачи в меню.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69caee1bef041a840927c91f50cd07d3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset b/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset new file mode 100644 index 0000000..0309e54 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u044B\u0432\u043E\u0434\u0438\u0442\u044C \u043F\u0440\u0438\u0437\u044B + \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u0438\u0441\u044C" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: DisplayNoPrizes + Alias: "\u0412\u044B\u0432\u043E\u0434\u0438\u0442\u044C \u043F\u0440\u0438\u0437\u044B + \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u0438\u0441\u044C" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset.meta b/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset.meta new file mode 100644 index 0000000..61545ed --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выводить призы закончились.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e1bc312a6cfdbf4680c1e3b31a04795 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset new file mode 100644 index 0000000..cce8168 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u044B\u0434\u0430\u0432\u0430\u0442\u044C \u043F\u0440\u0438\u0437 + \u043F\u0440\u0438 \u043E\u0448\u0438\u0431\u043A\u0435 3" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: TakeOrRisk + Alias: "\u0417\u0430\u0431\u0440\u0430\u0442\u044C \u0438\u043B\u0438 \u0440\u0438\u0441\u043A\u043D\u0443\u0442\u044C" + Description: + BoolValue: 1 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset.meta b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset.meta new file mode 100644 index 0000000..1fe5071 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке 3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff6ba1e5433e65f42b32e699881216df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset new file mode 100644 index 0000000..af013f7 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u044B\u0434\u0430\u0432\u0430\u0442\u044C \u043F\u0440\u0438\u0437 + \u043F\u0440\u0438 \u043E\u0448\u0438\u0431\u043A\u0435" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: PrizingWhenError + Alias: "\u0412\u044B\u0434\u0430\u0432\u0430\u0442\u044C \u043F\u0440\u0438\u0437 + \u043F\u0440\u0438 \u043E\u0448\u0438\u0431\u043A\u0435" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset.meta b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset.meta new file mode 100644 index 0000000..aab34c5 --- /dev/null +++ b/Assets/Data/Settings/Призы и выдача/Выдавать приз при ошибке.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a123ff973e1ed74bb6cc6602897592a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Сервис.meta b/Assets/Data/Settings/Сервис.meta new file mode 100644 index 0000000..baa10e2 --- /dev/null +++ b/Assets/Data/Settings/Сервис.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 556dabd09121fdf45a8443bc306bace4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Сервис/_Группа сервис.asset b/Assets/Data/Settings/Сервис/_Группа сервис.asset new file mode 100644 index 0000000..1267974 --- /dev/null +++ b/Assets/Data/Settings/Сервис/_Группа сервис.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1983628bbc4c4c8dfdc2a1637e058, type: 3} + m_Name: "_\u0413\u0440\u0443\u043F\u043F\u0430 \u0441\u0435\u0440\u0432\u0438\u0441" + m_EditorClassIdentifier: Assembly-CSharp::SettingsGroup + Name: "\u0421\u0435\u0440\u0432\u0438\u0441" + IconPath: + Settings: + - {fileID: 11400000, guid: f59c58d1b990b4f49ac2f634f7ce6040, type: 2} diff --git a/Assets/Data/Settings/Сервис/_Группа сервис.asset.meta b/Assets/Data/Settings/Сервис/_Группа сервис.asset.meta new file mode 100644 index 0000000..ef370f7 --- /dev/null +++ b/Assets/Data/Settings/Сервис/_Группа сервис.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1394b74f97fe4cf45adbce69982eb8bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset b/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset new file mode 100644 index 0000000..af6e89d --- /dev/null +++ b/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c97246c0e3a7eff46acd53fd591fb800, type: 3} + m_Name: "\u0412\u0445\u043E\u0434 \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 + \u043F\u043E \u043F\u0430\u0440\u043E\u043B\u044E" + m_EditorClassIdentifier: Assembly-CSharp::Setting + Type: 3 + Id: PasswordOnSettings + Alias: "\u0412\u0445\u043E\u0434 \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 + \u043F\u043E \u043F\u0430\u0440\u043E\u043B\u044E" + Description: + BoolValue: 0 + IntValue: 0 + IntMin: 0 + IntMax: 0 + IntStep: 0 + FloatValue: 0 + FloatMin: 0 + FloatMax: 0 + FloatStep: 0 + StringValue: + AllowedValues: [] + SignalValue: diff --git a/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset.meta b/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset.meta new file mode 100644 index 0000000..16f24f6 --- /dev/null +++ b/Assets/Data/Settings/Сервис/Вход в настройки по паролю.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f59c58d1b990b4f49ac2f634f7ce6040 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BoardDots.shadergraph b/Assets/Materials/BoardDots.shadergraph similarity index 100% rename from Assets/BoardDots.shadergraph rename to Assets/Materials/BoardDots.shadergraph diff --git a/Assets/BoardDots.shadergraph.meta b/Assets/Materials/BoardDots.shadergraph.meta similarity index 100% rename from Assets/BoardDots.shadergraph.meta rename to Assets/Materials/BoardDots.shadergraph.meta diff --git a/Assets/BoardDotsMAt.mat b/Assets/Materials/BoardDotsMAt.mat similarity index 100% rename from Assets/BoardDotsMAt.mat rename to Assets/Materials/BoardDotsMAt.mat diff --git a/Assets/BoardDotsMAt.mat.meta b/Assets/Materials/BoardDotsMAt.mat.meta similarity index 100% rename from Assets/BoardDotsMAt.mat.meta rename to Assets/Materials/BoardDotsMAt.mat.meta diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 9420d74..b45b2e6 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -470,9 +470,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 12 - fadeTime: 0.5 --- !u!114 &25002257 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2925,56 +2922,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ccde8447a38ec94da5c96f51363eae5, type: 3} m_Name: m_EditorClassIdentifier: - ModalWindow: {fileID: 1765056704} - fillCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 2 - outSlope: 2 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1938371 - value: 0.76749456 - inSlope: 0.94062805 - outSlope: 0.94062805 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AcceptImage: {fileID: 421209215} - ClearImage: {fileID: 1753366815} - symbols: [] - slots: - - {fileID: 557869784} - - {fileID: 119195214} - - {fileID: 1516663049} - - {fileID: 1812392302} - - {fileID: 1253935162} - - {fileID: 810397061} - L1: {fileID: 5478642365996012655, guid: 3aaea9637dca0b445b1d839f525d807a, type: 3} - L2: {fileID: 2664863102034636499, guid: c13dc83939ae18049b4b50ec7b260123, type: 3} - R1: {fileID: 7351317946119840001, guid: dc5c4f4a2efbbf14781534f71d50b918, type: 3} - R2: {fileID: 7541017001619366787, guid: ffdf7879d1bd76b42a3e3ca1ce8ee50d, type: 3} - D1: {fileID: 6154761721929434106, guid: b225421e2c7809142a03ab0f8f9914e1, type: 3} - D2: {fileID: 6644650027307130995, guid: b092372e5887fad459f13508e3ec862e, type: 3} --- !u!1 &139861217 GameObject: m_ObjectHideFlags: 0 @@ -3606,9 +3553,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 8 - fadeTime: 0.5 --- !u!114 &157258770 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3810,7 +3754,7 @@ VideoPlayer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 172285184} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: f3db78f4f2ff66f48a82d0ec55005777, type: 3} + m_VideoClip: {fileID: 0} m_TargetCameraAlpha: 1 m_TargetCamera3DLayout: 0 m_TargetCamera: {fileID: 519420031} @@ -5361,11 +5305,9 @@ GameObject: - component: {fileID: 259182281} - component: {fileID: 259182283} - component: {fileID: 259182284} - - component: {fileID: 259182286} - component: {fileID: 259182288} - component: {fileID: 259182290} - component: {fileID: 259182291} - - component: {fileID: 259182292} - component: {fileID: 259182293} m_Layer: 0 m_Name: '[GAME MANAGER]' @@ -5396,16 +5338,11 @@ MonoBehaviour: rulesController: {fileID: 454272343} chipPointer: {fileID: 1615046714} gameMode: 0 - boardTransform: {fileID: 0} - noPrizeLabel: {fileID: 0} player1score: 0 player2score: 0 vsBotScore: 0 vsBotMoves: 0 vsBotThinkTime: 0 - botScale: {fileID: 0} - Player1Scale: {fileID: 0} - Player2Scale: {fileID: 0} player1Chip: {fileID: 4478126490810938235, guid: 1e042d6979719a240abdf06769829f7f, type: 3} player2Chip: {fileID: 4478126490810938235, guid: 376ff57f7b90bd845a887cfd6ba95427, type: 3} botChip: {fileID: 4478126490810938235, guid: afe8782fb49b2254cbdae76f1a9f22a8, type: 3} @@ -5424,10 +5361,7 @@ MonoBehaviour: valutaPerPulseInput: {fileID: 483216802} leaderboard: {fileID: 1784614873} CharactersConfigurator: {fileID: 141381088} - pvpPointer: {fileID: 0} - movesAndTimeCounter: {fileID: 0} setPasswordPanel: {fileID: 131572818} - enterPasswordPanel: {fileID: 403995020} vitrinaPanel: {fileID: 61619038} qrPanel: {fileID: 1060301113} takeOrRiskPanel: {fileID: 7847968414815734404} @@ -5490,18 +5424,6 @@ MonoBehaviour: currentOpponent: 0 DummyPreset: {fileID: 11400000, guid: 35ba7f84d7557e8479f7f086269256f6, type: 2} dummyBots: 0 ---- !u!114 &259182286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 259182278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 896b3b244e3f8db4c8a6f4591ca9c68f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &259182288 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5575,18 +5497,6 @@ MonoBehaviour: ads: {fileID: 32900000, guid: a9b78f5df2dea0d43a26c922b9ccb85c, type: 3} ending: {fileID: 32900000, guid: a6b4af34fd1c1144aa20b71dd9a857d1, type: 3} canvas: {fileID: 0} ---- !u!114 &259182292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 259182278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1331a40789493ab488ebc7f5b640537e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &259182293 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5730,9 +5640,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 6 - fadeTime: 0.5 --- !u!114 &273486446 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6390,9 +6297,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d3a92d5d28462064f9d11d5b0fb6371d, type: 3} m_Name: m_EditorClassIdentifier: - rect: {fileID: 823351073} - amplitudeX: 3 - frequency: 7 --- !u!1 &350068842 GameObject: m_ObjectHideFlags: 0 @@ -7080,9 +6984,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 10 - fadeTime: 0.5 --- !u!114 &384990424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7312,49 +7213,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e0e91130ffc40c34bbf557582d2ce828, type: 3} m_Name: m_EditorClassIdentifier: - trueSound: {fileID: 8300000, guid: 0a17192e2e481bd48bf553f772fdcdb4, type: 3} - falseSound: {fileID: 8300000, guid: 48c70e631c1936044be943e214a1a37f, type: 3} - fillCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 2 - outSlope: 2 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - ClearImage: {fileID: 295854239} - ExitImage: {fileID: 1490957896} - symbols: - slots: - - {fileID: 1545109909} - - {fileID: 946558807} - - {fileID: 1593585639} - - {fileID: 1983771879} - - {fileID: 1483181578} - - {fileID: 1906506366} - L1: {fileID: 5478642365996012655, guid: 3aaea9637dca0b445b1d839f525d807a, type: 3} - L2: {fileID: 2664863102034636499, guid: c13dc83939ae18049b4b50ec7b260123, type: 3} - R1: {fileID: 7351317946119840001, guid: dc5c4f4a2efbbf14781534f71d50b918, type: 3} - R2: {fileID: 7541017001619366787, guid: ffdf7879d1bd76b42a3e3ca1ce8ee50d, type: 3} - D1: {fileID: 6154761721929434106, guid: b225421e2c7809142a03ab0f8f9914e1, type: 3} - D2: {fileID: 6644650027307130995, guid: b092372e5887fad459f13508e3ec862e, type: 3} - truePassword: 0 --- !u!114 &403995021 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8013,7 +7871,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -8021,7 +7879,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -8061,11 +7919,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 116.51001 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22.955 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8599,26 +8457,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a0d162bc3bcb184c85f6868a91ec25d, type: 3} m_Name: m_EditorClassIdentifier: - wowSounds: - - {fileID: 8300000, guid: 29599967917b951478bac8f635a95e50, type: 3} - - {fileID: 8300000, guid: 4f838a261615bfa43ba3eb996220fc27, type: 3} - - {fileID: 8300000, guid: 3f30602bb12acd141b9e8f267620c6e7, type: 3} - - {fileID: 8300000, guid: 6af5f3bed165a5a4dad8792eac0d25da, type: 3} - - {fileID: 8300000, guid: 92b84de5cf45d4346b962937981b38e6, type: 3} - - {fileID: 8300000, guid: 2f9ebb98df92f8b4b8a0e351e4751610, type: 3} - - {fileID: 8300000, guid: f68a79f9aac71134b9f975515dc97d20, type: 3} - pipeline: {fileID: 1406537360} - buttonTesters: - - {fileID: 972757447} - - {fileID: 728204933} - - {fileID: 1694584616} - - {fileID: 384990423} - - {fileID: 1681646676} - - {fileID: 1232377789} - - {fileID: 1918297013} - - {fileID: 2009546234} - - {fileID: 1414463880} - ExitImage: {fileID: 482416122} --- !u!1 &454272340 GameObject: m_ObjectHideFlags: 0 @@ -9135,9 +8973,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 10 - fadeTime: 0.5 --- !u!114 &476158309 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9970,7 +9805,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -9978,7 +9813,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -10018,11 +9853,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 271.19003 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22.955 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11755,10 +11590,6 @@ GameObject: - component: {fileID: 581100733} - component: {fileID: 581100732} - component: {fileID: 581100736} - - component: {fileID: 581100737} - - component: {fileID: 581100738} - - component: {fileID: 581100739} - - component: {fileID: 581100740} m_Layer: 5 m_Name: '[ADMIN PANEL]' m_TagString: Untagged @@ -11842,524 +11673,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c0343bffc1f51dc4ea7c7d3dc9fc25bf, type: 3} m_Name: m_EditorClassIdentifier: + NextSetting: 0 + PreviousSetting: 0 + ChangeSettingPositive: 0 + ChangeSettingNegative: 0 + GroupViewPrefab: {fileID: 0} pointer: {fileID: 334401358} - settingActions: - - Name: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u0441 \u0431\u043E\u0442\u043E\u043C" - Group: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterPvePrice - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0426\u0435\u043D\u0430 \u0440\u0435\u0432\u0430\u043D\u0448\u0430" - Group: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterPveRevengePrice - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u043D\u0430 \u0434\u0432\u043E\u0438\u0445" - Group: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterPvpPrice - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432\u0430\u043B\u044E\u0442\u044B" - Group: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterValutaName - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u041D\u043E\u043C\u0435\u0440 \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u043E\u0432" - Group: "\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterSupportNumber - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u041D\u043E\u043C\u0435\u0440 \u0442\u0435\u0445\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438" - Group: "\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterNumberTech - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0412\u043D\u0435\u0441\u0442\u0438 \u043E\u0441\u0442\u0430\u0442\u043E\u043A - \u043F\u0440\u0438\u0437\u043E\u0432" - Group: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: EnterPrizesAvailable - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u041D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043F\u0440\u0438\u0437\u044B - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439" - Group: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: ConfigurePrizes - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "C\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0441\u0447\u0435\u0442\u0447\u0438\u043A - \u0432\u044B\u0440\u0443\u0447\u043A\u0438" - Group: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A\u0438 \u0438 \u0441\u0431\u0440\u043E\u0441\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: ResetCoinsCounter - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0432\u044B\u0434\u0430\u043D\u043D\u044B\u0435 - \u043F\u0440\u0438\u0437\u044B" - Group: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A\u0438 \u0438 \u0441\u0431\u0440\u043E\u0441\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: ResetPrizes - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043E\u0448\u0438\u0431\u043A\u0443 - \u0432\u044B\u0434\u0430\u0447\u0438" - Group: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: ResetPrizeError - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0422\u0435\u0441\u0442 \u043A\u043D\u043E\u043F\u043E\u043A" - Group: "\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: EnterIO_test - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0422\u0435\u0441\u0442 \u0445\u043E\u043F\u043F\u0435\u0440\u0430" - Group: "\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: HopperTest - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0422\u0435\u0441\u0442 \u0437\u0432\u0443\u043A\u0430" - Group: "\u0417\u0432\u0443\u043A \u0438 \u043E\u0437\u0432\u0443\u0447\u043A\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: SoundTest - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0422\u0435\u0441\u0442 \u044D\u043A\u0440\u0430\u043D\u0430" - Group: "\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: CombinationFunctions, Assembly-CSharp - m_MethodName: ScreenTest - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0418\u043C\u043F\u0443\u043B\u044C\u0441\u043E\u0432 \u0434\u043E \u0441\u0431\u0440\u043E\u0441\u0430 - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438" - Group: "\u0418\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: ConfigurePulsesToResetDifficulty - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0412\u0430\u043B\u044E\u0442\u0430 \u0437\u0430 \u0438\u043C\u043F\u0443\u043B\u044C\u0441" - Group: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: ConfigureValutaPerPulse - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Name: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0431\u0430\u043B\u0430\u043D\u0441" - Group: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A\u0438 \u0438 \u0441\u0431\u0440\u043E\u0441\u044B" - OnPressed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 581100737} - m_TargetAssemblyTypeName: SettingsActions, Assembly-CSharp - m_MethodName: ResetBalance - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - excludedIds: [] - viewProvider: {fileID: 581100738} - SettingsContent: {fileID: 1092824966} - GeneralOffset: {x: 0, y: 0} - GroupHeaderPrefab: {fileID: 4694825826381118814, guid: d3327260e36e5944d8a903656f4fb764, type: 3} - GroupHeaderLeftMargin: 0 - GroupItemPrefab: {fileID: 4694825826381118814, guid: 959fadb1ff4c40540baceea041c5ab3f, type: 3} - GroupItemLeftMargin: 50 - pointerOffset: {x: -15, y: -25} - DescriptionContainer: {fileID: 73214862} - DescriptionProvider: {fileID: 581100739} - IconsProvider: {fileID: 581100740} - clip: {fileID: 8300000, guid: af069d6da1cc68847b46eaab855901ca, type: 3} ---- !u!114 &581100737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 581100730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4da4e82c58702a84f8bb59908fdd994c, type: 3} - m_Name: - m_EditorClassIdentifier: - IO_test: {fileID: 438536880} - testSound: {fileID: 8300000, guid: 4617bb2fac96e8a4eb451937db0183cf, type: 3} - ScreenTester: {fileID: 1603925511} - prizingDisabled: {fileID: 8300000, guid: f184441bc5bda974aa81f88f777a28bc, type: 3} - starts: {fileID: 1140329773} - startsNul: {fileID: 19565849} - prize: {fileID: 1764998039} - prizeNul: {fileID: 1165451721} ---- !u!114 &581100738 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 581100730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c4ccac32cdcedf41911646355347845, type: 3} - m_Name: - m_EditorClassIdentifier: - mappings: - - id: MusicVolume - prefab: {fileID: 7872553190807181184, guid: f2cc4d65460a1864cac8d119b87a76a2, type: 3} - - id: SoundsVolume - prefab: {fileID: 7872553190807181184, guid: f2cc4d65460a1864cac8d119b87a76a2, type: 3} - - id: Prizing - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: TakeOrRisk - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: EnableVoices - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: Difficulty - prefab: {fileID: 2411643208637742630, guid: ffadea15cbb760944a0da2c4cc5997d9, type: 3} - - id: Freeplay - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: ShowNumber - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: FastCheck - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: FastCheckPrizes - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: PrizingWhenError - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: DisplayPrizingError - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: Action - prefab: {fileID: 1804015508813908771, guid: 433c5f8525996f64298c0d7d58828797, type: 3} - - id: BaseBotDifficulty - prefab: {fileID: 2411643208637742630, guid: ffadea15cbb760944a0da2c4cc5997d9, type: 3} - - id: DisplayNoPrizes - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: PasswordOnSettings - prefab: {fileID: 1804015508813908771, guid: cdc2db675d691d3438e213fc716e5ae6, type: 3} - - id: PromoVolume - prefab: {fileID: 7872553190807181184, guid: f2cc4d65460a1864cac8d119b87a76a2, type: 3} ---- !u!114 &581100739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 581100730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28d7bc06abce926449048586cf2f9956, type: 3} - m_Name: - m_EditorClassIdentifier: - settingDescriptions: - - id: Difficulty - descriptionPrefab: {fileID: 7265677761729542613, guid: 3b36fff5e6f3b6d4bb73d407c03e57e4, type: 3} - - id: DisplayPrizingError - descriptionPrefab: {fileID: 7265677761729542613, guid: c02493ebea8ed684097b08816b35384e, type: 3} - - id: EnableVoices - descriptionPrefab: {fileID: 7265677761729542613, guid: 04fa33976093c1644826ae8bc76d3ac7, type: 3} - - id: FastCheck - descriptionPrefab: {fileID: 7265677761729542613, guid: 268cd97e18313524992fcd3ee6aa89f8, type: 3} - - id: FastCheckPrizes - descriptionPrefab: {fileID: 7265677761729542613, guid: f350d6a998ae46344bcd65a2bcb6eb3a, type: 3} - - id: Freeplay - descriptionPrefab: {fileID: 7265677761729542613, guid: f601ae0d27a2e534cb3b7e1811f2c954, type: 3} - - id: TakeOrRisk - descriptionPrefab: {fileID: 7265677761729542613, guid: 9d5393e2c374c6a49adf05d484f89bae, type: 3} - - id: MusicVolume - descriptionPrefab: {fileID: 7265677761729542613, guid: 7aa8f09ebc2045745b7cf6f501a0b998, type: 3} - - id: Prizing - descriptionPrefab: {fileID: 7265677761729542613, guid: 6036e21e2d40e2849acf16ca0457e81c, type: 3} - - id: PrizingWhenError - descriptionPrefab: {fileID: 7265677761729542613, guid: d3bf91c9f11c4b5419d1e93443715fd9, type: 3} - - id: ShowNumber - descriptionPrefab: {fileID: 7265677761729542613, guid: d741d2a4aa662264f8d7406c20150822, type: 3} - - id: SoundsVolume - descriptionPrefab: {fileID: 7265677761729542613, guid: beae4e18f4e06a8449964dede31fc838, type: 3} - - id: "C\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0441\u0447\u0435\u0442\u0447\u0438\u043A - \u0432\u044B\u0440\u0443\u0447\u043A\u0438" - descriptionPrefab: {fileID: 7265677761729542613, guid: 05c9bf5315c80f049a30239fff2cd8bf, type: 3} - - id: "\u0412\u043D\u0435\u0441\u0442\u0438 \u043E\u0441\u0442\u0430\u0442\u043E\u043A - \u043F\u0440\u0438\u0437\u043E\u0432" - descriptionPrefab: {fileID: 7265677761729542613, guid: 10cbebedafb2df241b9eddf05f288915, type: 3} - - id: "\u041D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043F\u0440\u0438\u0437\u044B - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439" - descriptionPrefab: {fileID: 7265677761729542613, guid: 234bf932bd72c9f449430c46d0e433ae, type: 3} - - id: "\u041D\u043E\u043C\u0435\u0440 \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u043E\u0432" - descriptionPrefab: {fileID: 7265677761729542613, guid: 882fab95e040ec64d937311be559f72e, type: 3} - - id: "\u041D\u043E\u043C\u0435\u0440 \u0442\u0435\u0445\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438" - descriptionPrefab: {fileID: 7265677761729542613, guid: 599c21b97aa7c4c4f9fb84b5cb425245, type: 3} - - id: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0432\u044B\u0434\u0430\u043D\u043D\u044B\u0435 - \u043F\u0440\u0438\u0437\u044B" - descriptionPrefab: {fileID: 7265677761729542613, guid: 20cb8bb7a39b15d4aaf6b8a2f3968254, type: 3} - - id: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043E\u0448\u0438\u0431\u043A\u0443 - \u0432\u044B\u0434\u0430\u0447\u0438" - descriptionPrefab: {fileID: 7265677761729542613, guid: c200b1a136f8ad5419cb637f0d7d1758, type: 3} - - id: "\u0421\u0443\u043F\u0435\u0440\u043F\u0440\u0438\u0437" - descriptionPrefab: {fileID: 7265677761729542613, guid: daa0cb3548628aa4c9ace4f958b1dada, type: 3} - - id: "\u0422\u0435\u0441\u0442 QR \u043A\u043E\u0434\u043E\u0432" - descriptionPrefab: {fileID: 7265677761729542613, guid: af7f040f017d3dc47a12c19125280707, type: 3} - - id: "\u0422\u0435\u0441\u0442 \u0437\u0432\u0443\u043A\u0430" - descriptionPrefab: {fileID: 7265677761729542613, guid: e9485c9faff55d644bef5a4cd66153a6, type: 3} - - id: "\u0422\u0435\u0441\u0442 \u043A\u043D\u043E\u043F\u043E\u043A" - descriptionPrefab: {fileID: 7265677761729542613, guid: b63b2098dab0b9e4f8d798bf21958cc2, type: 3} - - id: "\u0422\u0435\u0441\u0442 \u0445\u043E\u043F\u043F\u0435\u0440\u0430" - descriptionPrefab: {fileID: 7265677761729542613, guid: 2bbfea82bf423854a99ef00437773bd9, type: 3} - - id: "\u0422\u0435\u0441\u0442 \u044D\u043A\u0440\u0430\u043D\u0430" - descriptionPrefab: {fileID: 7265677761729542613, guid: ca633c95b8127b249adac1f5a89db218, type: 3} - - id: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u043D\u0430 \u0434\u0432\u043E\u0438\u0445" - descriptionPrefab: {fileID: 7265677761729542613, guid: f10b3bec3401b0e4f8869982816f0cb3, type: 3} - - id: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u0441 \u0431\u043E\u0442\u043E\u043C" - descriptionPrefab: {fileID: 7265677761729542613, guid: 61583e6dba133cc49abaacf9588b2517, type: 3} - - id: "\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432\u0430\u043B\u044E\u0442\u044B" - descriptionPrefab: {fileID: 7265677761729542613, guid: e65822cfbebdb764aa4907f5dfeeb1bb, type: 3} - - id: "\u0426\u0435\u043D\u0430 \u0440\u0435\u0432\u0430\u043D\u0448\u0430" - descriptionPrefab: {fileID: 7265677761729542613, guid: b42e5d1bcb3e93c4f90860279fd6c7a0, type: 3} - - id: BaseBotDifficulty - descriptionPrefab: {fileID: 7265677761729542613, guid: 5156fee5377691449961d4254078b172, type: 3} - - id: "\u0418\u043C\u043F\u0443\u043B\u044C\u0441\u043E\u0432 \u0434\u043E \u0441\u0431\u0440\u043E\u0441\u0430 - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438" - descriptionPrefab: {fileID: 7265677761729542613, guid: 9f236f027f147c64daa37c690d4437e6, type: 3} - - id: "\u0412\u0430\u043B\u044E\u0442\u0430 \u0437\u0430 \u0438\u043C\u043F\u0443\u043B\u044C\u0441" - descriptionPrefab: {fileID: 7265677761729542613, guid: 01e62ce41db1fff49b1f8122ba629e74, type: 3} - - id: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0431\u0430\u043B\u0430\u043D\u0441" - descriptionPrefab: {fileID: 7265677761729542613, guid: f1b38f94252bdb949a1235fa032e73da, type: 3} - - id: DisplayNoPrizes - descriptionPrefab: {fileID: 7265677761729542613, guid: 00a1bdf8cf92f60439bc2e7b62d53e51, type: 3} - - id: PasswordOnSettings - descriptionPrefab: {fileID: 7265677761729542613, guid: 2fd63316851eaa84d9771255e07e69cf, type: 3} - - id: PromoVolume - descriptionPrefab: {fileID: 7265677761729542613, guid: 20804b36a3f36e54588502fc0e16c610, type: 3} - defaultDescription: {fileID: 7265677761729542613, guid: 3da6c849967083641b4128baeb7ab2cd, type: 3} ---- !u!114 &581100740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 581100730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a4a365d22d377df438859fe56810e82e, type: 3} - m_Name: - m_EditorClassIdentifier: - Icons: - - Name: "\u0411\u044B\u0441\u0442\u0440\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438" - IconPrefab: {fileID: 4694825826381118814, guid: 0b9f0a29b8a151e4f888f18088a1c3f7, type: 3} - - Name: "\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430" - IconPrefab: {fileID: 4694825826381118814, guid: 7f1684113a3a02f48837a8971caba539, type: 3} - - Name: "\u0417\u0432\u0443\u043A \u0438 \u043E\u0437\u0432\u0443\u0447\u043A\u0430" - IconPrefab: {fileID: 4694825826381118814, guid: 6a203a6c76d3552458009d445b1430e5, type: 3} - - Name: "\u0418\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441" - IconPrefab: {fileID: 4694825826381118814, guid: eace0e3ffa7885346a5f8c8f35cf60fb, type: 3} - - Name: "\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430" - IconPrefab: {fileID: 4694825826381118814, guid: f8e814752c041ee4e81c0f049dc2b8ad, type: 3} - - Name: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - IconPrefab: {fileID: 4694825826381118814, guid: d6472c1b4d161314898b377a64253c57, type: 3} - - Name: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" - IconPrefab: {fileID: 4694825826381118814, guid: 4de5e8c413469c449bedbd39f074110c, type: 3} - - Name: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A\u0438 \u0438 \u0441\u0431\u0440\u043E\u0441\u044B" - IconPrefab: {fileID: 4694825826381118814, guid: a728c96cb10ae5c42901b45e76a8ccba, type: 3} - - Name: "\u0421\u0435\u0440\u0432\u0438\u0441" - IconPrefab: {fileID: 4694825826381118814, guid: a728c96cb10ae5c42901b45e76a8ccba, type: 3} - defaultIcon: {fileID: 4694825826381118814, guid: 612cb682b003c2e47b1b19691392af69, type: 3} + scrollRect: {fileID: 0} + Content: {fileID: 0} + scrollSmoothTime: 0.2 --- !u!1 &583807441 GameObject: m_ObjectHideFlags: 0 @@ -12624,7 +11946,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 27edee241c0fb934ebe299af31cf6c77, type: 3} m_Name: m_EditorClassIdentifier: - settingActions: [] --- !u!4 &592995719 Transform: m_ObjectHideFlags: 0 @@ -15776,9 +15097,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 2 - fadeTime: 0.5 --- !u!114 &728204934 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15867,9 +15185,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 2 - fadeTime: 0.5 --- !u!114 &729888166 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15930,7 +15245,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -15938,7 +15253,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -15978,11 +15293,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 348.53003 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22.955 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19806,9 +19121,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 3 - fadeTime: 0.5 --- !u!114 &972757448 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21825,7 +21137,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!223 &1081324696 Canvas: m_ObjectHideFlags: 0 @@ -21848,7 +21160,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 1 m_SortingLayerID: -2009484265 - m_SortingOrder: 3 + m_SortingOrder: 20 m_TargetDisplay: 0 --- !u!224 &1081324697 RectTransform: @@ -22159,7 +21471,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -22167,7 +21479,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -22207,11 +21519,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 193.85 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22.955 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22636,12 +21948,12 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 + m_VertexColorAlwaysGammaSpace: 1 m_UseReflectionProbes: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 1 m_SortingLayerID: -2009484265 - m_SortingOrder: 2 + m_SortingOrder: 50 m_TargetDisplay: 0 --- !u!224 &1122363135 RectTransform: @@ -24862,9 +24174,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 8 - fadeTime: 0.5 --- !u!114 &1232377790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27958,10 +27267,12 @@ MonoBehaviour: vitrinaCatcher: {fileID: 1984502421} avatarController: {fileID: 1851050354} gameManager: {fileID: 259182279} - characterController: {fileID: 0} - characterEventBus: {fileID: 0} - countersCollector: {fileID: 0} - defender: {fileID: 0} + characterController: {fileID: 1542626844} + characterEventBus: {fileID: 1542626846} + defender: {fileID: 1606109335} + controlsPerformer: {fileID: 1948752563} + menu: {fileID: 1122363137} + defaultSettings: {fileID: 11400000, guid: b0b04f5868cf5024aa52cb64831e32b9, type: 2} --- !u!1 &1400366661 GameObject: m_ObjectHideFlags: 0 @@ -28585,9 +27896,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 12 - fadeTime: 0.5 --- !u!114 &1414463881 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30034,9 +29342,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 7 - fadeTime: 0.5 --- !u!114 &1515396963 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30605,21 +29910,20 @@ MonoBehaviour: m_GameObject: {fileID: 1542626843} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 258d0b28fdc0a254c94a52b560e44624, type: 3} + m_Script: {fileID: 11500000, guid: f79f1e2c50eb4b14583157ed5996c65f, type: 3} m_Name: m_EditorClassIdentifier: charactersContainer: {fileID: 365101956} charactersPool: {fileID: 963346424} characterPrefabs: - - {fileID: 2262463401082199893, guid: dbde6acf97979cd4caaca68f83b75d64, type: 3} - - {fileID: 2262463401082199893, guid: 280922cd1d9e3ef44bdbfe757f8cfdef, type: 3} - - {fileID: 2262463401082199893, guid: b1bd71cccf32b4c4a94b2ff65361e9fe, type: 3} - - {fileID: 2262463401082199893, guid: 8813a05b560fe74499373105c065d482, type: 3} - - {fileID: 2262463401082199893, guid: 4b7845a03cf955e4488f4e3286f11b60, type: 3} - characters: [] - hiddenLocalPosition: {x: 2000, y: -350} - shownLocalPosition: {x: 600, y: -350} - speed: 5000 + - {fileID: 8873348988979391587, guid: dbde6acf97979cd4caaca68f83b75d64, type: 3} + - {fileID: 8873348988979391587, guid: 280922cd1d9e3ef44bdbfe757f8cfdef, type: 3} + - {fileID: 8873348988979391587, guid: b1bd71cccf32b4c4a94b2ff65361e9fe, type: 3} + - {fileID: 8873348988979391587, guid: 8813a05b560fe74499373105c065d482, type: 3} + - {fileID: 8873348988979391587, guid: 4b7845a03cf955e4488f4e3286f11b60, type: 3} + hiddenLocalPosition: {x: 2000, y: 0} + shownLocalPosition: {x: 0, y: 0} + speed: 2000 --- !u!4 &1542626845 Transform: m_ObjectHideFlags: 0 @@ -31477,7 +30781,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86b7d5bfd360a9f49a1e020d85361b28, type: 3} m_Name: m_EditorClassIdentifier: - label: {fileID: 1582004091} --- !u!114 &1582004090 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31731,9 +31034,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 1 - fadeTime: 0.5 --- !u!114 &1586183572 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31901,32 +31201,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f2cb7146587aca4db2a8f47e1a3e2d4, type: 3} m_Name: m_EditorClassIdentifier: - key: NumberTech - loadData: 1 - saveDataOnClose: 1 - SlotPrefab: {fileID: 7148623651430003250, guid: 96886dcf6731fc04cb74950b67f18b94, type: 3} - slotsRoot: {fileID: 1673976229} - slotsCount: 11 - rootPaddingX: 0 - rootPaddingY: 0 - gapSize: 20 - animationSpeed: 5 - fontSizeNormal: 55 - fontSizeHighlighted: 70 - fontColorNormal: {r: 0.7207546, g: 0.7207546, b: 0.7207546, a: 1} - fontColorHighlighted: {r: 1, g: 1, b: 1, a: 1} - slotSizeMultiplier: 1.1 - slotColorNormal: {r: 0.10188681, g: 0.10188681, b: 0.10188681, a: 0.9372549} - slotColorHighlighted: {r: 0.16226411, g: 0.16226411, b: 0.16226411, a: 1} - switchSlotSound: {fileID: 8300000, guid: 5cf50d37b8f977f4882c10f48834dece, type: 3} - switchLetterSound: {fileID: 8300000, guid: 1c48900c9ab0aa8418920a8193050870, type: 3} - acceptSound: {fileID: 8300000, guid: f6487badb5f19654987d378966c5362e, type: 3} - openSound: {fileID: 8300000, guid: f6487badb5f19654987d378966c5362e, type: 3} - alphabetString: 0123456789 - MaxSpeedLetterPerSecond: 15 - MinSpeedLetterPerSecond: 3 - MaxSpeedTime: 4 - MinSpeedTime: 0.5 --- !u!114 &1596344491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32382,7 +31656,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc5bfad969b74a143a1d679b4c3794e8, type: 3} m_Name: m_EditorClassIdentifier: - timeToDisable: 4 --- !u!1 &1606007088 GameObject: m_ObjectHideFlags: 0 @@ -32489,6 +31762,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606007088} m_CullTransparentMesh: 1 +--- !u!1 &1606109334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1606109336} + - component: {fileID: 1606109335} + m_Layer: 0 + m_Name: defender + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1606109335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606109334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d41195f615b81df4fa279b07293b0218, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Defender +--- !u!4 &1606109336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606109334} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.75817, y: 0.47778, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1615046713 GameObject: m_ObjectHideFlags: 0 @@ -32945,8 +32262,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} + m_fontAsset: {fileID: 11400000, guid: 22f2885a5e6fc644bb1a6897b25d458a, type: 2} + m_sharedMaterial: {fileID: -184755688813310951, guid: 22f2885a5e6fc644bb1a6897b25d458a, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -33245,9 +32562,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 11 - fadeTime: 0.5 --- !u!114 &1681646677 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33548,9 +32862,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 11 - fadeTime: 0.5 --- !u!114 &1690767838 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33639,9 +32950,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 1 - fadeTime: 0.5 --- !u!114 &1694584617 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37805,9 +37113,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 7 - fadeTime: 0.5 --- !u!114 &1918297014 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38402,6 +37707,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1933433627} m_CullTransparentMesh: 1 +--- !u!1 &1948752562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1948752564} + - component: {fileID: 1948752563} + m_Layer: 0 + m_Name: Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1948752563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948752562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b4855ad6643fd248881a941bc6c4837, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ControlsPerformer +--- !u!4 &1948752564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948752562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.75817, y: 0.47778, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1950727762 GameObject: m_ObjectHideFlags: 0 @@ -39821,9 +39170,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 1 - button: 3 - fadeTime: 0.5 --- !u!114 &1997844676 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40126,9 +39472,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5c5eb049fac9ad4abb6fe960d3429b6, type: 3} m_Name: m_EditorClassIdentifier: - active: 0 - button: 6 - fadeTime: 0.5 --- !u!114 &2009546235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42596,8 +41939,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} + m_fontAsset: {fileID: 11400000, guid: 22f2885a5e6fc644bb1a6897b25d458a, type: 2} + m_sharedMaterial: {fileID: -184755688813310951, guid: 22f2885a5e6fc644bb1a6897b25d458a, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -43796,7 +43139,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -43804,7 +43147,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -43844,11 +43187,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 39.170002 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22.955 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -44953,32 +44296,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f2cb7146587aca4db2a8f47e1a3e2d4, type: 3} m_Name: m_EditorClassIdentifier: - key: ValutaName - loadData: 1 - saveDataOnClose: 1 - SlotPrefab: {fileID: 7148623651430003250, guid: 96886dcf6731fc04cb74950b67f18b94, type: 3} - slotsRoot: {fileID: 2345442381488893429} - slotsCount: 10 - rootPaddingX: 0 - rootPaddingY: 0 - gapSize: 20 - animationSpeed: 5 - fontSizeNormal: 55 - fontSizeHighlighted: 70 - fontColorNormal: {r: 0.7207546, g: 0.7207546, b: 0.7207546, a: 1} - fontColorHighlighted: {r: 1, g: 1, b: 1, a: 1} - slotSizeMultiplier: 1.1 - slotColorNormal: {r: 0.10188681, g: 0.10188681, b: 0.10188681, a: 0.9372549} - slotColorHighlighted: {r: 0.16226411, g: 0.16226411, b: 0.16226411, a: 1} - switchSlotSound: {fileID: 8300000, guid: 5cf50d37b8f977f4882c10f48834dece, type: 3} - switchLetterSound: {fileID: 8300000, guid: 1c48900c9ab0aa8418920a8193050870, type: 3} - acceptSound: {fileID: 8300000, guid: f6487badb5f19654987d378966c5362e, type: 3} - openSound: {fileID: 8300000, guid: f6487badb5f19654987d378966c5362e, type: 3} - alphabetString: "\u0430\u0431\u0432\u0433\u0434\u0435\u0451\u0436\u0437\u0438\u0439\u043A\u043B\u043C\u043D\u043E\u043F\u0440\u0441\u0442\u0443\u0444\u0445\u0446\u0447\u0448\u0449\u044A\u044B\u044C\u044D\u044E\u044F\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E\u042F0123456789." - MaxSpeedLetterPerSecond: 15 - MinSpeedLetterPerSecond: 3 - MaxSpeedTime: 4 - MinSpeedTime: 0.5 --- !u!1 &5475115496630895061 GameObject: m_ObjectHideFlags: 0 @@ -45253,6 +44570,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -91.755005 objectReference: {fileID: 0} + - target: {fileID: 5808839904501214485, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 354e5ca841e41ac448f1254f8140bc2b, type: 2} + - target: {fileID: 5808839904501214485, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2554744838589517846, guid: 354e5ca841e41ac448f1254f8140bc2b, type: 2} + - target: {fileID: 5808839904501214485, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5811791877448665319, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -46755,6 +46084,7 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1396811479} + - {fileID: 1948752564} - {fileID: 519420032} - {fileID: 1122363135} - {fileID: 1081324697} @@ -46770,3 +46100,4 @@ SceneRoots: - {fileID: 172285186} - {fileID: 1615046716} - {fileID: 46193421} + - {fileID: 1606109336} diff --git a/Assets/Scripts/Bootstrap.cs b/Assets/Scripts/Bootstrap.cs index e3c84bf..dc20d59 100644 --- a/Assets/Scripts/Bootstrap.cs +++ b/Assets/Scripts/Bootstrap.cs @@ -15,11 +15,17 @@ public class Bootstrap : MonoBehaviour [SerializeField] private VitrinaCatcher vitrinaCatcher; [SerializeField] private DualAvatarController avatarController; [SerializeField] private GameManager gameManager; - [SerializeField] private CharacterController characterController; + [SerializeField] private CharactersController characterController; [SerializeField] private CharacterEventBus characterEventBus; - [SerializeField] private CountersCollector countersCollector; + //[SerializeField] private CountersCollector countersCollector; [SerializeField] private Defender defender; + + // + [SerializeField] private ControlsPerformer controlsPerformer; + [SerializeField] private MenuLayoutController menu; + + [SerializeField] private SettingsScheme defaultSettings; private void Awake() => Initialize(); private void Initialize() @@ -28,7 +34,7 @@ public class Bootstrap : MonoBehaviour Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false; - SettingsManager.Initialize(); + SettingsManager.Initialize(defaultSettings); soundManager.Initialize(); @@ -57,12 +63,18 @@ public class Bootstrap : MonoBehaviour avatarController.GetComponent().Initialize(); avatarController.Initialize(); - gameManager.Initialize(); - board.Init(); characterEventBus.Initialize(); characterController.Initialize(); - countersCollector.Initialize(); + gameManager.Initialize(); + board.Init(); + + //countersCollector.Initialize(); + + menu.Initialize(); + controlsPerformer.Initialize(); + controlsPerformer.SetControlable(menu); + Destroy(gameObject); } diff --git a/Assets/Scripts/Common/CoinCounter.cs b/Assets/Scripts/Common/CoinCounter.cs index 03f6bbc..071692c 100644 --- a/Assets/Scripts/Common/CoinCounter.cs +++ b/Assets/Scripts/Common/CoinCounter.cs @@ -7,13 +7,11 @@ public class CoinCounter : MonoBehaviour public CanvasGroup balanceSignGroup; private bool initialized = false; - void OnEnable() => Init(); - - private void Init() + private void Initialize() { UpdateBalanceLabelBySettings(); PaymentSystem.OnBalanceChanged += UpdateBalanceLabel; - SettingsManager.OnSettingsChanged.AddListener(UpdateBalanceLabelBySettings); + SettingsManager.OnSettingsChanged+=UpdateBalanceLabelBySettings; initialized = true; } @@ -23,12 +21,12 @@ public class CoinCounter : MonoBehaviour if (!initialized) return; PaymentSystem.OnBalanceChanged -= UpdateBalanceLabel; - SettingsManager.OnSettingsChanged.RemoveListener(UpdateBalanceLabelBySettings); + SettingsManager.OnSettingsChanged -= UpdateBalanceLabelBySettings; } private void UpdateBalanceLabelBySettings() { - bool freeplay = SettingsManager.GetBool(SettingKeys.FREEPLAY, false); + bool freeplay = SettingsManager.GetBool(SettingKey.FREEPLAY); if(freeplay) { balanceLabel.text = "бесплатно"; diff --git a/Assets/Scripts/Common/FileUtil.cs b/Assets/Scripts/Common/FileUtil.cs new file mode 100644 index 0000000..fda7d76 --- /dev/null +++ b/Assets/Scripts/Common/FileUtil.cs @@ -0,0 +1,106 @@ +using System; +using System.IO; +using UnityEngine; + +public class FileUtil +{ + public static (bool OK, string Message) SaveText(string fileName, string filePath, string content) + { + try + { + string fullPath = Path.Combine(filePath, fileName); + string directory = Path.GetDirectoryName(fullPath); + + if (!Directory.Exists(directory)) + Directory.CreateDirectory(directory); + + File.WriteAllText(fullPath, content); + return (true, $"Файл успешно сохранен: {fullPath}"); + } + catch (Exception ex) + { + return (false, $"Ошибка сохранения: {ex.Message}"); + } + } + + public static (bool OK, string Message, string Content) LoadText(string fileName, string filePath) + { + try + { + string fullPath = Path.Combine(filePath, fileName); + + if (!File.Exists(fullPath)) + { + return (false, $"Файл не найден: {fullPath}", null); + } + + string content = File.ReadAllText(fullPath); + return (true, $"Файл успешно загружен: {fullPath}", content); + } + catch (Exception ex) + { + return (false, $"Ошибка загрузки: {ex.Message}", null); + } + } + + public static (bool OK, string Message) SaveJson(string fileName, string filePath, T data) + { + try + { + string json = JsonUtility.ToJson(data, true); + return SaveText(fileName, filePath, json); + } + catch (Exception ex) + { + return (false, $"Ошибка сохранения JSON: {ex.Message}"); + } + } + + public static (bool OK, string Message) SaveJson(string fileName, AppDirectory directory, T data) + => SaveJson(fileName, GetDirectoryName(directory), data); + + private static string GetDirectoryName(AppDirectory directory) + { + return directory switch + { + AppDirectory.Streaming => Application.streamingAssetsPath, + AppDirectory.Persistent => Application.persistentDataPath, + _ => Path.Combine(Application.persistentDataPath, "TRASH") + }; + } + + public static (bool OK, string Message, T Data) LoadJson(string fileName, string filePath) where T : new() + { + try + { + var result = LoadText(fileName, filePath); + + if (!result.OK) + { + return (false, result.Message, default(T)); + } + + T data = JsonUtility.FromJson(result.Content); + + if (data == null) + { + return (false, "Ошибка десериализации JSON", default(T)); + } + + return (true, $"JSON успешно загружен: {fileName}", data); + } + catch (Exception ex) + { + return (false, $"Ошибка загрузки JSON: {ex.Message}", default(T)); + } + } + + public static (bool OK, string Message, T Data) LoadJson(string fileName, AppDirectory directory) where T : new() + => LoadJson(fileName, GetDirectoryName(directory)); + + public enum AppDirectory + { + Streaming, + Persistent + } +} diff --git a/Assets/Scripts/Common/FileUtil.cs.meta b/Assets/Scripts/Common/FileUtil.cs.meta new file mode 100644 index 0000000..1ac1bbd --- /dev/null +++ b/Assets/Scripts/Common/FileUtil.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9c952c53ed9902b43a7e318b9286587d \ No newline at end of file diff --git a/Assets/Scripts/Common/GameFSM/BotThinkingState.cs b/Assets/Scripts/Common/GameFSM/BotThinkingState.cs index 47dd558..4632c1f 100644 --- a/Assets/Scripts/Common/GameFSM/BotThinkingState.cs +++ b/Assets/Scripts/Common/GameFSM/BotThinkingState.cs @@ -28,7 +28,7 @@ public class BotThinkingState : IState { //Установка пресета сложности - DifficultyPreset currentPreset = CharacterController.CurrentCharacter.CurrentDifficultyPreset; + DifficultyPreset currentPreset = CharactersController.CurrentCharacter.CurrentDifficultyPreset; //Debug.Log(currentPreset.Description); if (DifficultyManager.Instance.dummyBots) currentPreset = DifficultyManager.Instance.DummyPreset; @@ -51,9 +51,9 @@ public class BotThinkingState : IState timeToThink = 0; CharacterEventBus.Instance.OnBotTurn?.Invoke(); - animator = CharacterController.CurrentCharacter.GetComponent(); + animator = CharactersController.CurrentCharacter.GetComponent(); - try{ animLength = CharacterController.CurrentCharacter.chipSpawningAnim.length; } + try{ animLength = CharactersController.CurrentCharacter.chipSpawningAnim.length; } catch { } } @@ -105,8 +105,8 @@ public class BotThinkingState : IState GameManager gm = GameManager.instance; bool OnBossByScore = gm.vsBotScore == gm.botsAmount - 1; - bool IsHardCommonDifficulty = SettingsManager.GetString("Difficulty", "Средняя") == "Сложная"; - bool IsUpperCashDifficulty = SettingsManager.GetString("BaseBotDifficulty", "Повышенная") == "Повышенная"; + bool IsHardCommonDifficulty = SettingsManager.GetString(SettingKey.DIFFICULTY) == "Сложная"; + bool IsUpperCashDifficulty = SettingsManager.GetString(SettingKey.DIFFICULTY_MODE) == "Заработок"; bool NeedSuperPreset = OnBossByScore && (IsHardCommonDifficulty || IsUpperCashDifficulty); if (NeedSuperPreset) diff --git a/Assets/Scripts/Common/GameFSM/CheckSettingsPasswordState.cs b/Assets/Scripts/Common/GameFSM/CheckSettingsPasswordState.cs index d41a995..6c6b803 100644 --- a/Assets/Scripts/Common/GameFSM/CheckSettingsPasswordState.cs +++ b/Assets/Scripts/Common/GameFSM/CheckSettingsPasswordState.cs @@ -2,20 +2,20 @@ using UnityEngine; public class CheckSettingsPasswordState : IState { - EnterPasswordPanel panel; + //EnterPasswordPanel panel; public void enter() { - panel = GameManager.instance.enterPasswordPanel; + //panel = GameManager.instance.enterPasswordPanel; Debug.Log("[Проход в настройки]"); //Пароль не установлен. - bool Pwd = SettingsManager.GetBool("PasswordOnSettings", false); - if (!Pwd) - { - Debug.Log("[Пароля нет, заходим братья]"); - GameManager.instance.stateMachine.ChangeState(new SettingsState()); - return; - } + //bool Pwd = SettingsManager.GetBool(SettingKey.PASSWORD_ON_SETTINGS, false); + //if (!Pwd) + //{ + // Debug.Log("[Пароля нет, заходим братья]"); + // GameManager.instance.stateMachine.ChangeState(new SettingsState()); + // return; + //} //Пароль есть. //Получить пароль. @@ -33,8 +33,8 @@ public class CheckSettingsPasswordState : IState if (PasswordValid(password)) { // если валидный, то запускаем ввод пароля - panel.gameObject.SetActive(true); - panel.Initialize(password); + //panel.gameObject.SetActive(true); + //panel.Initialize(password); } else { @@ -52,23 +52,24 @@ public class CheckSettingsPasswordState : IState private static void disableCheck() { - Setting setting = SettingsManager.Container.TryGetSetting("PasswordOnSettings"); - setting.ChangeValue(-1);//ставим false - SettingsManager.OnSettingsChanged?.Invoke(); + //Setting setting = SettingsManager.Container.TryGetSetting(SettingKey.PASSWORD_ON_SETTINGS); + //setting.ChangeValue(-1);//ставим false + //SettingsManager.OnSettingsChanged?.Invoke(); } public void exit() { - panel.gameObject.SetActive(false); + //panel.gameObject.SetActive(false); } public void update() { - panel._Update(); - if (panel.truePassword) - { + //panel._Update(); + //if (panel.truePassword) + //{ + // GameManager.instance.stateMachine.ChangeState(new SettingsState()); + //} GameManager.instance.stateMachine.ChangeState(new SettingsState()); - } } private bool PasswordValid(string password) diff --git a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNameState.cs b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNameState.cs index a1cbf31..885050d 100644 --- a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNameState.cs +++ b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNameState.cs @@ -31,19 +31,19 @@ public class EnterNameState : IState public void update() { int discreteDir = 0; - if (In.GetButtonDown(ButtonPinMapping.left1)) discreteDir -= 1; - if (In.GetButtonDown(ButtonPinMapping.right1)) discreteDir += 1; + if (In.GetButtonDown(InSignal.left1)) discreteDir -= 1; + if (In.GetButtonDown(InSignal.right1)) discreteDir += 1; int continiousDir = 0; - if (In.GetButton(ButtonPinMapping.left2)) continiousDir -= 1; - if (In.GetButton(ButtonPinMapping.right2)) continiousDir += 1; + if (In.GetButton(InSignal.left2)) continiousDir -= 1; + if (In.GetButton(InSignal.right2)) continiousDir += 1; textInput.SwitchSlot(discreteDir); textInput.SwitchLetter(continiousDir); if (In.GetButtonDownAnyPlayer(PlayerAction.down)) { - name = textInput.AcceptAndClose(); + //name = textInput.AcceptAndClose(); //формирование записи int time = (int)gm.vsBotThinkTime; diff --git a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNumberTech.cs b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNumberTech.cs index cd24a62..77298fa 100644 --- a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNumberTech.cs +++ b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterNumberTech.cs @@ -28,19 +28,19 @@ public class EnterNumberTech : IState public void update() { int discreteDir = 0; - if (In.GetButtonDown(ButtonPinMapping.left1)) discreteDir -= 1; - if (In.GetButtonDown(ButtonPinMapping.right1)) discreteDir += 1; + if (In.GetButtonDown(InSignal.left1)) discreteDir -= 1; + if (In.GetButtonDown(InSignal.right1)) discreteDir += 1; int continiousDir = 0; - if (In.GetButton(ButtonPinMapping.left2)) continiousDir -= 1; - if (In.GetButton(ButtonPinMapping.right2)) continiousDir += 1; + if (In.GetButton(InSignal.left2)) continiousDir -= 1; + if (In.GetButton(InSignal.right2)) continiousDir += 1; textInput.SwitchSlot(discreteDir); textInput.SwitchLetter(continiousDir); if (In.GetButtonDownAnyPlayer(PlayerAction.down)) { - PlayerPrefs.SetString("Price", textInput.AcceptAndClose()); + //PlayerPrefs.SetString("Price", textInput.AcceptAndClose()); //переход //gm.stateMachine.ChangeState(new SettingsState()); diff --git a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterValutaNameState.cs b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterValutaNameState.cs index 8e7893c..0058f09 100644 --- a/Assets/Scripts/Common/GameFSM/EnterPanels/EnterValutaNameState.cs +++ b/Assets/Scripts/Common/GameFSM/EnterPanels/EnterValutaNameState.cs @@ -28,19 +28,19 @@ public class EnterValutaNameState : IState public void update() { int discreteDir = 0; - if (In.GetButtonDown(ButtonPinMapping.left1)) discreteDir -= 1; - if (In.GetButtonDown(ButtonPinMapping.right1)) discreteDir += 1; + if (In.GetButtonDown(InSignal.left1)) discreteDir -= 1; + if (In.GetButtonDown(InSignal.right1)) discreteDir += 1; int continiousDir = 0; - if (In.GetButton(ButtonPinMapping.left2)) continiousDir -= 1; - if (In.GetButton(ButtonPinMapping.right2)) continiousDir += 1; + if (In.GetButton(InSignal.left2)) continiousDir -= 1; + if (In.GetButton(InSignal.right2)) continiousDir += 1; textInput.SwitchSlot(discreteDir); textInput.SwitchLetter(continiousDir); if (In.GetButtonDownAnyPlayer(PlayerAction.down)) { - PlayerPrefs.SetString("Price", textInput.AcceptAndClose()); + //PlayerPrefs.SetString("Price", textInput.AcceptAndClose()); //переход //gm.stateMachine.ChangeState(new SettingsState()); diff --git a/Assets/Scripts/Common/GameFSM/EnterPanels/GetNumberState.cs b/Assets/Scripts/Common/GameFSM/EnterPanels/GetNumberState.cs index 1e10bd2..6c335d1 100644 --- a/Assets/Scripts/Common/GameFSM/EnterPanels/GetNumberState.cs +++ b/Assets/Scripts/Common/GameFSM/EnterPanels/GetNumberState.cs @@ -50,28 +50,28 @@ public class GetNumberState : IState { //Меняем слот - if (In.GetButtonDown(ButtonPinMapping.left1)) + if (In.GetButtonDown(InSignal.left1)) { switchSlot(-1); } - if (In.GetButtonDown(ButtonPinMapping.right1)) + if (In.GetButtonDown(InSignal.right1)) { switchSlot(1); } //меняем букву в слоте - if (In.GetButtonDown(ButtonPinMapping.left2)) + if (In.GetButtonDown(InSignal.left2)) { switchDigit(-1); } - if (In.GetButtonDown(ButtonPinMapping.right2)) + if (In.GetButtonDown(InSignal.right2)) { switchDigit(1); } //записываем и выходим - if (In.GetButtonDown(ButtonPinMapping.down2)) + if (In.GetButtonDown(InSignal.down2)) { //GameManager.instance.stateMachine.ChangeState(new SettingsState()); GameManager.instance.stateMachine.ChangeState(prevState); diff --git a/Assets/Scripts/Common/GameFSM/MenuState.cs b/Assets/Scripts/Common/GameFSM/MenuState.cs index e3df9aa..3f6deb6 100644 --- a/Assets/Scripts/Common/GameFSM/MenuState.cs +++ b/Assets/Scripts/Common/GameFSM/MenuState.cs @@ -45,7 +45,7 @@ private bool HandleSettings() { - bool settingButtonPressed = In.GetButton(ButtonPinMapping.secret); + bool settingButtonPressed = In.GetButton(InSignal.secret); bool gotoSettings = UnityEngine.Input.GetKeyDown(UnityEngine.KeyCode.F5) || settingsTimer.Update(settingButtonPressed); if (gotoSettings) { @@ -92,9 +92,9 @@ { mode = GameMode.pve; - if (In.GetButtonDown(ButtonPinMapping.startOnePlayer)) + if (In.GetButtonDown(InSignal.startOnePlayer)) mode = GameMode.pve; - else if (In.GetButtonDown(ButtonPinMapping.startTwoPlayers)) + else if (In.GetButtonDown(InSignal.startTwoPlayers)) mode = GameMode.pvp; else return false; @@ -109,7 +109,7 @@ gm.SetMode(mode); gm.timerManager.SetTimersActivity(gm.gameMode); //ui.CloseMenu(); - gm.InitVictoryScales(); + //gm.InitVictoryScales(); subState = MenuSubStates.WaitAnimation; return true; @@ -119,12 +119,12 @@ { //if (ui.AnimationInProcess) return; - CharacterController.ResetState(); + CharactersController.ResetState(); SoundManager.instance.playChoose(); gm.PrepareRound(CellState.Player1); - if (gm.gameMode == GameMode.pve) - gm.movesAndTimeCounter.SetVisibility(true); + //if (gm.gameMode == GameMode.pve) + // gm.movesAndTimeCounter.SetVisibility(true); } private void TransitionTo(IState state, bool playSound = true) diff --git a/Assets/Scripts/Common/GameFSM/PositioningState.cs b/Assets/Scripts/Common/GameFSM/PositioningState.cs index 04c9da0..e550976 100644 --- a/Assets/Scripts/Common/GameFSM/PositioningState.cs +++ b/Assets/Scripts/Common/GameFSM/PositioningState.cs @@ -38,12 +38,12 @@ public class PositioningState : IState pointer.SetColorByPlayer(gm.currentPlayer); pointer.SetPosition(targetPosition); - if (gm.gameMode == GameMode.pvp) - { - gm.pvpPointer.SetColor(gm.currentPlayer); - gm.pvpPointer.SetVisibility(true); - gm.pvpPointer.MoveTo(stickedPosition); - } + //if (gm.gameMode == GameMode.pvp) + //{ + // gm.pvpPointer.SetColor(gm.currentPlayer); + // gm.pvpPointer.SetVisibility(true); + // gm.pvpPointer.MoveTo(stickedPosition); + //} if (gm.gameMode == GameMode.pve) gm.StartVsBotTimer(); @@ -51,7 +51,7 @@ public class PositioningState : IState public void exit() { - gm.pvpPointer.SetVisibility(false); + //gm.pvpPointer.SetVisibility(false); gm.StopVsBotTimer(); pointer.Hide(); } @@ -83,15 +83,15 @@ public class PositioningState : IState //перемещение указателей pointer.SetPosition(targetPosition); - if (gm.gameMode == GameMode.pvp) - gm.pvpPointer.MoveTo(stickedPosition); + //if (gm.gameMode == GameMode.pvp) + // gm.pvpPointer.MoveTo(stickedPosition); SoundManager.instance.playSwitch(); } private bool HandleExitToMenu() { - bool exitPressed = In.GetButtonDown(ButtonPinMapping.startOnePlayer) || In.GetButtonDown(ButtonPinMapping.startTwoPlayers); + bool exitPressed = In.GetButtonDown(InSignal.startOnePlayer) || In.GetButtonDown(InSignal.startTwoPlayers); if (exitPressed && gm.canReturnToMenu) { board.MakeClearField(); diff --git a/Assets/Scripts/Common/GameFSM/PromoState.cs b/Assets/Scripts/Common/GameFSM/PromoState.cs index 77783d6..dc48507 100644 --- a/Assets/Scripts/Common/GameFSM/PromoState.cs +++ b/Assets/Scripts/Common/GameFSM/PromoState.cs @@ -26,8 +26,8 @@ public class PromoState : IState bool anyInput = In.GetButtonDownAnyPlayer(PlayerAction.left) || In.GetButtonDownAnyPlayer(PlayerAction.right) || In.GetButtonDownAnyPlayer(PlayerAction.down) || - In.GetButtonDown(ButtonPinMapping.startOnePlayer) || - In.GetButtonDown(ButtonPinMapping.startTwoPlayers); + In.GetButtonDown(InSignal.startOnePlayer) || + In.GetButtonDown(InSignal.startTwoPlayers); bool kinoVse = (Time.time - startTime) > videoLength; diff --git a/Assets/Scripts/Common/GameFSM/SettingsState.cs b/Assets/Scripts/Common/GameFSM/SettingsState.cs index b05e298..78998ea 100644 --- a/Assets/Scripts/Common/GameFSM/SettingsState.cs +++ b/Assets/Scripts/Common/GameFSM/SettingsState.cs @@ -1,5 +1,4 @@ -//refactored 12.01.26 -using UnityEngine; +using UnityEngine; public class SettingsState : IState { @@ -8,7 +7,7 @@ public class SettingsState : IState public void enter() { - SettingsManager.OnSettingsChanged?.Invoke(); + //SettingsManager.OnSettingsChanged?.Invoke(); GameManager.instance.AdminPanel.SetActive(true); elapsedTime = 0; } @@ -30,8 +29,8 @@ public class SettingsState : IState private bool ShouldExit() { //опрашиваем кнопки - bool startButtonsPressed = In.GetButton(ButtonPinMapping.startOnePlayer) && In.GetButton(ButtonPinMapping.startTwoPlayers); - bool serviceButtonPressed = In.GetButton(ButtonPinMapping.secret) || Input.GetKey(KeyCode.F5); + bool startButtonsPressed = In.GetButton(InSignal.startOnePlayer) && In.GetButton(InSignal.startTwoPlayers); + bool serviceButtonPressed = In.GetButton(InSignal.secret) || Input.GetKey(KeyCode.F5); bool exitPressed = startButtonsPressed || serviceButtonPressed; //считаем таймеры diff --git a/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs b/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs index 4b29034..86e763c 100644 --- a/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs +++ b/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs @@ -163,7 +163,7 @@ public class ShowWinnerState : IState { //Вопрос к логике тут. //bool bossUpgraded = GameManager.instance.BossUpgraded; - bool bossFirst = SettingsManager.GetString("BaseBotDifficulty", "Фиксированная") != "Обычная"; + bool bossFirst = SettingsManager.GetString(SettingKey.DIFFICULTY_MODE) != "Прохождение"; CellState firstRoundPlayer = bossFirst ? CellState.Player2 : CellState.Player1; gm.PrepareRound(firstRoundPlayer); return; @@ -213,7 +213,7 @@ public class ShowWinnerState : IState gm.PrepareRound(nextPlayer); break; case EndOption.Menu://чистим поле и переходим в меню с параметром чтобы панельки съехались обратно - CharacterController.HideCharacter(); + CharactersController.HideCharacter(); DualAvatarController.Instance.HideCharacters(); Board.Instance.MakeClearField(); //GameManager.instance.stateMachine.ChangeState(new MenuState(fromGameplay: true)); @@ -243,7 +243,7 @@ public class ShowWinnerState : IState left.transform.GetChild(0).GetComponent().color = orange; } - if (In.GetButtonDown(ButtonPinMapping.startOnePlayer)) + if (In.GetButtonDown(InSignal.startOnePlayer)) { option = EndOption.Restart; SoundManager.instance.playChoose(); @@ -253,7 +253,7 @@ public class ShowWinnerState : IState restart(); } - if (In.GetButtonDown(ButtonPinMapping.startTwoPlayers)) + if (In.GetButtonDown(InSignal.startTwoPlayers)) { option = EndOption.Menu; SoundManager.instance.playChoose(); diff --git a/Assets/Scripts/Common/GameFSM/StateRouter.cs b/Assets/Scripts/Common/GameFSM/StateRouter.cs index b1fb589..919d80c 100644 --- a/Assets/Scripts/Common/GameFSM/StateRouter.cs +++ b/Assets/Scripts/Common/GameFSM/StateRouter.cs @@ -32,31 +32,31 @@ public static class StateRouter private static IState BotWinHandler() { LightUtility.Lose(); - CharacterController.CurrentCharacter.GetComponent().SetTrigger("Win"); + CharactersController.CurrentCharacter.GetComponent().SetTrigger("Win"); DifficultyManager.Instance.DecreaseDifficulty(); if (gm.vsBotScore != 0) gm.vsBotScore -= 1; CharacterEventBus.Instance.OnBotWin?.Invoke(); - gm.botScale.SetMedalsCount(gm.vsBotScore); + //gm.botScale.SetMedalsCount(gm.vsBotScore); return new ShowWinnerState(); } private static IState PlayerWinPveHandler() //тут нужна обертка в приз + обертка в приз/супер приз { - bool prizing = SettingsManager.GetBool("Prizing", false); + bool prizing = SettingsManager.GetBool(SettingKey.PRIZING); if (!prizing) return NextBot(); - bool takeOrRisk = SettingsManager.GetBool("TakeOrRisk", false); + bool takeOrRisk = SettingsManager.GetBool(SettingKey.TAKE_OR_RISK); if (!takeOrRisk) { TryGivePrize(); return NextBot(); } - var currentPrize = CharacterController.CurrentCharacter.prize; - bool currentBotHasNonEmptyPrize = CharacterController.CurrentCharacter.HasPrize && currentPrize is not EmptyPrize; + var currentPrize = CharactersController.CurrentCharacter.prize; + bool currentBotHasNonEmptyPrize = CharactersController.CurrentCharacter.HasPrize && currentPrize is not EmptyPrize; if(currentPrize is VitrinaPrize vitrinaPrize) { @@ -84,10 +84,10 @@ public static class StateRouter void TryGivePrize() { - if (CharacterController.CurrentCharacter.HasPrize) + if (CharactersController.CurrentCharacter.HasPrize) { - PrizeSystemManager.GivePrize(CharacterController.CurrentCharacter.prize); - CharacterController.CurrentCharacter.HasPrize = false; + PrizeSystemManager.GivePrize(CharactersController.CurrentCharacter.prize); + CharactersController.CurrentCharacter.HasPrize = false; } } @@ -101,9 +101,9 @@ public static class StateRouter CharacterEventBus.Instance.OnPlayerWin?.Invoke(); LightUtility.Win(); - CharacterController.CurrentCharacter.Animator.SetTrigger("Lose"); + CharactersController.CurrentCharacter.Animator.SetTrigger("Lose"); - gm.botScale.SetMedalsCount(gm.vsBotScore); + //gm.botScale.SetMedalsCount(gm.vsBotScore); //если фишку победили, то повышаем. if (gm.vsBotScore == gm.botsAmount) @@ -111,7 +111,7 @@ public static class StateRouter if (TotalWin()) { - ClearAllScales(); + //ClearAllScales(); return new VictoryState(); } else @@ -123,7 +123,7 @@ public static class StateRouter private static IState PlayerWinPvpHandler(CellState winner) { - gm.IncreaseScoreAndScaleOfPlayer(winner); + gm.IncreaseScore(winner); if (TotalWin()) AvatarEventBus.Instance.OnEndGame?.Invoke(gm.currentPlayer); @@ -132,7 +132,7 @@ public static class StateRouter if (TotalWin()) { - ClearAllScales(); + //ClearAllScales(); return new VictoryState(); } else @@ -166,10 +166,10 @@ public static class StateRouter private static bool TotalWin() => gm.player1score == 5 || gm.player2score == 5 || gm.vsBotScore == gm.botsAmount; - private static void ClearAllScales()//нужен менеджер шкал - { - if (gm.botScale.isActiveAndEnabled) gm.botScale.ClearScale(); - if (gm.Player1Scale.isActiveAndEnabled) gm.Player1Scale.ClearScale(); - if (gm.Player2Scale.isActiveAndEnabled) gm.Player2Scale.ClearScale(); - } + //private static void ClearAllScales()//нужен менеджер шкал + //{ + // if (gm.botScale.isActiveAndEnabled) gm.botScale.ClearScale(); + // if (gm.Player1Scale.isActiveAndEnabled) gm.Player1Scale.ClearScale(); + // if (gm.Player2Scale.isActiveAndEnabled) gm.Player2Scale.ClearScale(); + //} } diff --git a/Assets/Scripts/Common/GameFSM/TakeOrRiskState.cs b/Assets/Scripts/Common/GameFSM/TakeOrRiskState.cs index ea8c00c..e8f6461 100644 --- a/Assets/Scripts/Common/GameFSM/TakeOrRiskState.cs +++ b/Assets/Scripts/Common/GameFSM/TakeOrRiskState.cs @@ -24,10 +24,10 @@ public class TakeOrRiskState : IState { if (selectedOption == TakeOrRiskOption.Take) { - if (CharacterController.CurrentCharacter.HasPrize) + if (CharactersController.CurrentCharacter.HasPrize) { - PrizeSystemManager.GivePrize(CharacterController.CurrentCharacter.prize); - CharacterController.CurrentCharacter.HasPrize = false; + PrizeSystemManager.GivePrize(CharactersController.CurrentCharacter.prize); + CharactersController.CurrentCharacter.HasPrize = false; } GameManager.instance.stateMachine.ChangeState(new PrizeState(StateRouter.ToMenu())); } diff --git a/Assets/Scripts/Common/GameFSM/VictoryState.cs b/Assets/Scripts/Common/GameFSM/VictoryState.cs index d975c24..60ded68 100644 --- a/Assets/Scripts/Common/GameFSM/VictoryState.cs +++ b/Assets/Scripts/Common/GameFSM/VictoryState.cs @@ -3,7 +3,6 @@ using UnityEngine; public class VictoryState : IState { - VictoryScale scale; GameManager gameManager; TextMeshProUGUI ToMenuLabel; @@ -28,32 +27,32 @@ public class VictoryState : IState if (gameManager.gameMode == GameMode.pvp) { nextState = new ShowWinnerState(); - if (gameManager.currentPlayer == CellState.Player1) - { - scale = gameManager.Player1Scale; - } - else - { - scale = gameManager.Player2Scale; - } + //if (gameManager.currentPlayer == CellState.Player1) + //{ + // scale = gameManager.Player1Scale; + //} + //else + //{ + // scale = gameManager.Player2Scale; + //} } else { //победили ботов - scale = gameManager.botScale; + //scale = gameManager.botScale; nextState = new VictoryVideoState(new EnterNameState()); } - //вкл анимацию приза - scale.SetWinState(); - scale.winParticles.Play(); + ////вкл анимацию приза + //scale.SetWinState(); + //scale.winParticles.Play(); } public void exit() { //выкл анимацию приза - scale.SetIdleState(); - scale.winParticles.Stop(); + //scale.SetIdleState(); + //scale.winParticles.Stop(); ToMenuLabel.gameObject.SetActive(false); } diff --git a/Assets/Scripts/Common/GameFSM/VictoryVideoState.cs b/Assets/Scripts/Common/GameFSM/VictoryVideoState.cs index 78a343b..b3cc4b0 100644 --- a/Assets/Scripts/Common/GameFSM/VictoryVideoState.cs +++ b/Assets/Scripts/Common/GameFSM/VictoryVideoState.cs @@ -33,8 +33,8 @@ public class VictoryVideoState : IState bool anyInput = In.GetButtonDownAnyPlayer(PlayerAction.left) || In.GetButtonDownAnyPlayer(PlayerAction.right) || In.GetButtonDownAnyPlayer(PlayerAction.down) || - In.GetButtonDown(ButtonPinMapping.startOnePlayer) || - In.GetButtonDown(ButtonPinMapping.startTwoPlayers); + In.GetButtonDown(InSignal.startOnePlayer) || + In.GetButtonDown(InSignal.startTwoPlayers); bool kinoVse = (Time.time - startTime) > videoLength; diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 5b48b78..35e0930 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -1,8 +1,6 @@ using PrizeSystem; using System.Collections; -using TMPro; using UnityEngine; -using UnityEngine.UI; public enum GameMode { pve, pvp } public class GameManager : MonoBehaviour { @@ -24,9 +22,6 @@ public class GameManager : MonoBehaviour [Header("Menu")] public GameMode gameMode; - public Transform - boardTransform, - noPrizeLabel; [Header("Scores")] public int player1score = 0, player2score = 0, vsBotScore = 0; @@ -35,8 +30,6 @@ public class GameManager : MonoBehaviour public int vsBotMoves; public float vsBotThinkTime; - public VictoryScale botScale, Player1Scale, Player2Scale; - [HideInInspector] public CheckResult lastResult; @@ -69,11 +62,11 @@ public class GameManager : MonoBehaviour - public PvpPointer pvpPointer; - public MovesAndTimeCounter movesAndTimeCounter; + //public PvpPointer pvpPointer; + //public MovesAndTimeCounter movesAndTimeCounter; public GameObject setPasswordPanel; - public EnterPasswordPanel enterPasswordPanel; + //public EnterPasswordPanel enterPasswordPanel; @@ -90,7 +83,7 @@ public class GameManager : MonoBehaviour ComWrapper.PaymentReceived += ProcessDifficultyCounter; ProcessDifficultyCounter(); - SettingsManager.OnSettingsChanged.AddListener(ProcessDifficultyCounter); + SettingsManager.OnSettingsChanged+=ProcessDifficultyCounter; StatsService = new(); StatsService.Initialize(); @@ -131,7 +124,7 @@ public class GameManager : MonoBehaviour currentChip = Instantiate(chipPrefab, new Vector2(0, 20), Quaternion.identity); currentChip.Team = currentPlayer; if (currentPlayer == CellState.Player2) - currentChip.GetComponentInChildren().sprite = CharacterController.CurrentChipImage; + currentChip.GetComponentInChildren().sprite = CharactersController.CurrentCharacter.chipImage; } @@ -142,83 +135,48 @@ public class GameManager : MonoBehaviour public void SetMode(GameMode mode) => gameMode = mode; - public void InitVictoryScales() - { - //Включить и обнулить нужные шкалы - player1score = 0; - player2score = 0; - vsBotScore = 0; - switch (gameMode) - { - case GameMode.pvp: - botScale.gameObject.SetActive(false); - Player1Scale.gameObject.SetActive(true); - Player2Scale.gameObject.SetActive(true); - Player1Scale.SetSlotsCount(5); - Player2Scale.SetSlotsCount(5); - - Player1Scale.ResetScale(); - Player2Scale.ResetScale(); - break; - case GameMode.pve: - botScale.gameObject.SetActive(true); - botScale.SetSlotsCount(botsAmount); - - Player1Scale.gameObject.SetActive(false); - Player2Scale.gameObject.SetActive(false); - - botScale.ResetScale(); - break; - } - } - - public void IncreaseScoreAndScaleOfPlayer(CellState player) + public void IncreaseScore(CellState player) { if (player == CellState.Player1) - { player1score += 1; - Player1Scale.SetMedalsCount(player1score); - } else - { player2score += 1; - Player2Scale.SetMedalsCount(player2score); - } } public void ProcessDifficultyCounter()//вызывается каждый раз, когда приходит COIN с платы или обновились настройки { - string previous = PlayerPrefs.GetString("PreviousBaseBotDifficulty", "Обычная"); - string difficultyType = SettingsManager.GetString("BaseBotDifficulty", "?"); + string previous = PlayerPrefs.GetString("PreviousBaseBotDifficulty", "Прохождение"); + string difficultyType = SettingsManager.GetString(SettingKey.DIFFICULTY_MODE); //Инициализация if (!PlayerPrefs.HasKey("PulsesToResetDifficulty")) PlayerPrefs.SetInt("PulsesToResetDifficulty", 100); //если переход с повышенной на обычную - сброс счетчика - if (previous == "Повышенная" && difficultyType != previous) + if (previous == "Заработок" && difficultyType != previous) { PaymentSystem.ResetPulsesCounter(); } PlayerPrefs.SetString("PreviousBaseBotDifficulty", difficultyType); - if (difficultyType == "Повышенная") + if (difficultyType == "Заработок") { int pulses = PaymentSystem.PulsesCounter; int pulsesToResetDifficulty = PlayerPrefs.GetInt("PulsesToResetDifficulty", 10); - if (pulses >= pulsesToResetDifficulty) - { - PaymentSystem.ResetPulsesCounter(); - Setting difficultySetting = SettingsManager.Container.TryGetSetting("BaseBotDifficulty"); - difficultySetting.StringValue = "Обычная"; - SettingsManager.OnSettingsChanged?.Invoke(); - SettingsManager.SaveContainerToFile(); - AdminPanel.GetComponent().RefreshViews(); - print("Сложность сброшена"); - } + //todo: разобраться + //if (pulses >= pulsesToResetDifficulty) + //{ + // PaymentSystem.ResetPulsesCounter(); + //Setting difficultySetting = SettingsManager.Container.TryGetSetting(SettingKeys.DIFFICULTY_MODE); + // difficultySetting.StringValue = "Прохождение"; + // SettingsManager.OnSettingsChanged?.Invoke(); + // SettingsManager.SaveContainerToFile(); + // AdminPanel.GetComponent().RefreshViews(); + // print("Сложность сброшена"); + //} } } @@ -231,7 +189,7 @@ public class GameManager : MonoBehaviour { timerManager.SetActiveTimer(CellState.Player1); int difficultyIndex = DifficultyManager.Instance.currentOpponent; - CharacterController.SwitchToCharacter(difficultyIndex); + CharactersController.SwitchToCharacter(difficultyIndex); } else if (gameMode == GameMode.pvp) DualAvatarController.Instance.ShowCharacters(); @@ -261,7 +219,7 @@ public class GameManager : MonoBehaviour if (gameMode == GameMode.pvp) nextState = new PositioningState(); else - nextState = new BotThinkingState(CharacterController.CurrentCharacter.ThinkTime); + nextState = new BotThinkingState(CharactersController.CurrentCharacter.ThinkTime); stateMachine.ChangeState(nextState); } @@ -272,10 +230,10 @@ public class GameManager : MonoBehaviour vsBotThinkTime = 0; StopVsBotTimer(); vsBotMoves = 0; - movesAndTimeCounter.SetVisibility(false); + //movesAndTimeCounter.SetVisibility(false); - CharacterController.HideCharacter(); - CharacterController.I.SetAllCharactersPrizeAvailable(true); + CharactersController.HideCharacter(); + CharactersController.I.SetAllCharactersPrizeAvailable(true); DualAvatarController.Instance.HideCharacters(); DifficultyManager.Instance.ResetDifficulty(); diff --git a/Assets/Scripts/Common/Inputs/ButtonPinMapping.cs.meta b/Assets/Scripts/Common/Inputs/ButtonPinMapping.cs.meta deleted file mode 100644 index 7adda1e..0000000 --- a/Assets/Scripts/Common/Inputs/ButtonPinMapping.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c04cc3dd9806f994da26c99ce4695d60 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Inputs/COMinput.cs b/Assets/Scripts/Common/Inputs/COMinput.cs index 2f47b4b..450031e 100644 --- a/Assets/Scripts/Common/Inputs/COMinput.cs +++ b/Assets/Scripts/Common/Inputs/COMinput.cs @@ -17,10 +17,10 @@ public class COMinput : InputSource private bool[] buttonUp = new bool[PIN_COUNT]; // Словарь для маппинга ButtonPinMapping -> физический пин - private Dictionary pinMappings = new Dictionary(); + private Dictionary pinMappings = new Dictionary(); // Обратный словарь для быстрого доступа - private Dictionary reverseMappings = new Dictionary(); + private Dictionary reverseMappings = new Dictionary(); //Свойство для определения текущего игрока //Должно возвращать 1 или 2 @@ -60,22 +60,22 @@ public class COMinput : InputSource if (elektroVersion == 1) { // Версия 1 (старая распиновка) - pinMappings[ButtonPinMapping.up1] = 0; - pinMappings[ButtonPinMapping.right1] = 1; - pinMappings[ButtonPinMapping.down1] = 2; - pinMappings[ButtonPinMapping.left1] = 3; - pinMappings[ButtonPinMapping.action1] = 4; - pinMappings[ButtonPinMapping.up2] = 5; - pinMappings[ButtonPinMapping.right2] = 6; - pinMappings[ButtonPinMapping.down2] = 7; - pinMappings[ButtonPinMapping.left2] = 8; - pinMappings[ButtonPinMapping.action2] = 9; - pinMappings[ButtonPinMapping.startOnePlayer] = 10; - pinMappings[ButtonPinMapping.startTwoPlayers] = 11; - pinMappings[ButtonPinMapping.secret] = 12; - pinMappings[ButtonPinMapping.extra] = 13; - pinMappings[ButtonPinMapping.hasPrize] = 14; - pinMappings[ButtonPinMapping.prizeGiven] = 15; + pinMappings[InSignal.up1] = 0; + pinMappings[InSignal.right1] = 1; + pinMappings[InSignal.down1] = 2; + pinMappings[InSignal.left1] = 3; + pinMappings[InSignal.action1] = 4; + pinMappings[InSignal.up2] = 5; + pinMappings[InSignal.right2] = 6; + pinMappings[InSignal.down2] = 7; + pinMappings[InSignal.left2] = 8; + pinMappings[InSignal.action2] = 9; + pinMappings[InSignal.startOnePlayer] = 10; + pinMappings[InSignal.startTwoPlayers] = 11; + pinMappings[InSignal.secret] = 12; + pinMappings[InSignal.extra] = 13; + pinMappings[InSignal.hasPrize] = 14; + pinMappings[InSignal.prizeGiven] = 15; Debug.Log($"Используется версия 1 распиновки. Полученная версия: {elektroVersion}"); @@ -85,22 +85,22 @@ public class COMinput : InputSource else { // Версия 2 (Дефолт) - pinMappings[ButtonPinMapping.up1] = 0; - pinMappings[ButtonPinMapping.right1] = 1; - pinMappings[ButtonPinMapping.down1] = 2; - pinMappings[ButtonPinMapping.left1] = 3; - pinMappings[ButtonPinMapping.action1] = 4; - pinMappings[ButtonPinMapping.up2] = 10; - pinMappings[ButtonPinMapping.right2] = 7; - pinMappings[ButtonPinMapping.down2] = 8; - pinMappings[ButtonPinMapping.left2] = 9; - pinMappings[ButtonPinMapping.action2] = 11; - pinMappings[ButtonPinMapping.startOnePlayer] = 5; - pinMappings[ButtonPinMapping.startTwoPlayers] = 6; - pinMappings[ButtonPinMapping.secret] = 12; - pinMappings[ButtonPinMapping.extra] = 13; - pinMappings[ButtonPinMapping.hasPrize] = 14; - pinMappings[ButtonPinMapping.prizeGiven] = 15; + pinMappings[InSignal.up1] = 0; + pinMappings[InSignal.right1] = 1; + pinMappings[InSignal.down1] = 2; + pinMappings[InSignal.left1] = 3; + pinMappings[InSignal.action1] = 4; + pinMappings[InSignal.up2] = 10; + pinMappings[InSignal.right2] = 7; + pinMappings[InSignal.down2] = 8; + pinMappings[InSignal.left2] = 9; + pinMappings[InSignal.action2] = 11; + pinMappings[InSignal.startOnePlayer] = 5; + pinMappings[InSignal.startTwoPlayers] = 6; + pinMappings[InSignal.secret] = 12; + pinMappings[InSignal.extra] = 13; + pinMappings[InSignal.hasPrize] = 14; + pinMappings[InSignal.prizeGiven] = 15; Debug.Log("Используется версия 2 распиновки (новая)"); } @@ -115,7 +115,7 @@ public class COMinput : InputSource /// /// Получает физический номер пина для указанной кнопки /// - private int GetPhysicalPin(ButtonPinMapping button) + private int GetPhysicalPin(InSignal button) { if (pinMappings.TryGetValue(button, out int pin)) return pin; @@ -127,14 +127,14 @@ public class COMinput : InputSource /// /// Получает ButtonPinMapping для физического пина /// - private ButtonPinMapping? GetButtonForPhysicalPin(int physicalPin) + private InSignal? GetButtonForPhysicalPin(int physicalPin) { - if (reverseMappings.TryGetValue(physicalPin, out ButtonPinMapping button)) + if (reverseMappings.TryGetValue(physicalPin, out InSignal button)) return button; // Если пин не найден в маппинге, пытаемся конвертировать напрямую - if (Enum.IsDefined(typeof(ButtonPinMapping), physicalPin)) - return (ButtonPinMapping)physicalPin; + if (Enum.IsDefined(typeof(InSignal), physicalPin)) + return (InSignal)physicalPin; return null; } @@ -149,7 +149,7 @@ public class COMinput : InputSource /// /// Пин кнопки на периферийной плате /// True если кнопка нажата в текущем кадре - public override bool GetButton(ButtonPinMapping button) => buttonState[GetPhysicalPin(button)]; + public override bool GetButton(InSignal button) => buttonState[GetPhysicalPin(button)]; /// /// Проверяет, была ли кнопка нажата в начале текущего кадра. @@ -157,7 +157,7 @@ public class COMinput : InputSource /// /// Пин кнопки на периферийной плате /// True если кнопка была нажата в этом кадре - public override bool GetButtonDown(ButtonPinMapping button) => ConsumeButtonEvent(buttonDown, GetPhysicalPin(button)); + public override bool GetButtonDown(InSignal button) => ConsumeButtonEvent(buttonDown, GetPhysicalPin(button)); /// /// Проверяет, была ли кнопка отпущена в начале текущего кадра. @@ -165,7 +165,7 @@ public class COMinput : InputSource /// /// Пин кнопки на периферийной плате /// True если кнопка была отпущена в этом кадре - public override bool GetButtonUp(ButtonPinMapping button) => ConsumeButtonEvent(buttonUp, GetPhysicalPin(button)); + public override bool GetButtonUp(InSignal button) => ConsumeButtonEvent(buttonUp, GetPhysicalPin(button)); /// @@ -269,29 +269,29 @@ public class COMinput : InputSource //==========ХЕЛПЕРЫ========== // Проверка нажатия с обоих контроллеров игроков - private bool CheckBothPlayers(PlayerAction action, Func buttonFunc) + private bool CheckBothPlayers(PlayerAction action, Func buttonFunc) { var buttons = _buttonByAction(action); return buttonFunc(buttons.player1button) || buttonFunc(buttons.player2button); } // Проверка нажатия с контроллера текущего игрока - private ButtonPinMapping GetButtonForCurrentPlayer(PlayerAction button) + private InSignal GetButtonForCurrentPlayer(PlayerAction button) { var buttons = _buttonByAction(button); return currentPlayer == 1 ? buttons.player1button : buttons.player2button; } // Маппер из действий игрока => пины платы - private (ButtonPinMapping player1button, ButtonPinMapping player2button) _buttonByAction(PlayerAction playerAction) => + private (InSignal player1button, InSignal player2button) _buttonByAction(PlayerAction playerAction) => playerAction switch { - PlayerAction.up => (ButtonPinMapping.up1, ButtonPinMapping.up2), - PlayerAction.down => (ButtonPinMapping.down1, ButtonPinMapping.down2), - PlayerAction.left => (ButtonPinMapping.left1, ButtonPinMapping.left2), - PlayerAction.right => (ButtonPinMapping.right1, ButtonPinMapping.right2), - PlayerAction.action => (ButtonPinMapping.action1, ButtonPinMapping.action2), - PlayerAction.extra => (ButtonPinMapping.extra, ButtonPinMapping.extra), // одинаковая кнопка + PlayerAction.up => (InSignal.up1, InSignal.up2), + PlayerAction.down => (InSignal.down1, InSignal.down2), + PlayerAction.left => (InSignal.left1, InSignal.left2), + PlayerAction.right => (InSignal.right1, InSignal.right2), + PlayerAction.action => (InSignal.action1, InSignal.action2), + PlayerAction.extra => (InSignal.extra, InSignal.extra), // одинаковая кнопка _ => throw new ArgumentException($"Unknown player action: {playerAction}") }; @@ -324,7 +324,7 @@ public class COMinput : InputSource } //Проверка прошел ли приз через сенсор - int prizeSensorPin = GetPhysicalPin(ButtonPinMapping.hasPrize); + int prizeSensorPin = GetPhysicalPin(InSignal.hasPrize); char sensorPositive = ConfigManager.Config.SensorPositiveValue.ToString()[0]; @@ -338,7 +338,7 @@ public class COMinput : InputSource } // Потребление "Нажатия"/"Отжатия". Возвращает что там было и чистит флаг из буфера - private bool ConsumeButtonEvent(bool[] buffer, ButtonPinMapping button) + private bool ConsumeButtonEvent(bool[] buffer, InSignal button) { int physicalPin = GetPhysicalPin(button); bool result = buffer[physicalPin]; diff --git a/Assets/Scripts/Common/Inputs/In.cs b/Assets/Scripts/Common/Inputs/In.cs index 9933799..e09af8e 100644 --- a/Assets/Scripts/Common/Inputs/In.cs +++ b/Assets/Scripts/Common/Inputs/In.cs @@ -20,52 +20,27 @@ public class In : MonoBehaviour //[SerializeField] private InputSourceType inputType; static InputSource source; - - /// - /// Инициализирует систему ввода на основе выбранного типа. - /// Должен быть вызван один раз при запуске приложения. - /// - /// - /// Создает соответствующий экземпляр InputSource: - /// - KeyboardInput для тестирования на клавиатуре - /// - COMinput для работы с периферийной платой - /// + public void Initialize() { - /* source = inputType switch - { - InputSourceType.Keyboard => new KeyboardInput(), - InputSourceType.COM => new COMinput(), - _ => throw new System.NotImplementedException() - };*/ - - - //ТЕСТЫ #if UNITY_EDITOR source = new KeyboardInput(); #else source = new COMinput(); #endif - //source = new COMinput(); - - var success = source.Initialize(); if (!success) Debug.LogWarning("Не удалось проинициалзировать источник управления."); } - // ================================================================================ - // СТАТИЧЕСКИЕ МЕТОДЫ ДЛЯ РАБОТЫ С ФИЗИЧЕСКИМИ ПИНАМИ - // ================================================================================ - /// Проверяет состояние конкретной кнопки по её физическому пину - public static bool GetButton(ButtonPinMapping button) => source.GetButton(button); + public static bool GetButton(InSignal button) => source.GetButton(button); /// Проверяет нажатие кнопки по пину в текущем кадре - public static bool GetButtonDown(ButtonPinMapping button) => source.GetButtonDown(button); + public static bool GetButtonDown(InSignal button) => source.GetButtonDown(button); /// Проверяет отпускание кнопки по пину в текущем кадре - public static bool GetButtonUp(ButtonPinMapping button) => source.GetButtonUp(button); + public static bool GetButtonUp(InSignal button) => source.GetButtonUp(button); /// Проверяет состояние кнопки по числовому индексу пина public static bool GetButton(int pinindex) => source.GetButton(pinindex); diff --git a/Assets/Scripts/Common/Inputs/ButtonPinMapping.cs b/Assets/Scripts/Common/Inputs/InSignal.cs similarity index 98% rename from Assets/Scripts/Common/Inputs/ButtonPinMapping.cs rename to Assets/Scripts/Common/Inputs/InSignal.cs index 9b5e564..abbf1d5 100644 --- a/Assets/Scripts/Common/Inputs/ButtonPinMapping.cs +++ b/Assets/Scripts/Common/Inputs/InSignal.cs @@ -2,7 +2,7 @@ /// Соответствие между кнопками игрового ввода и цифровыми выходами периферийной платы (пины 0-15). /// Содержит mapping для управления двух игроков, служебных кнопок и датчиков хопера. /// -public enum ButtonPinMapping +public enum InSignal { /// Кнопка движения вверх для первого игрока up1 = 0, diff --git a/Assets/Scripts/Common/Inputs/InSignal.cs.meta b/Assets/Scripts/Common/Inputs/InSignal.cs.meta new file mode 100644 index 0000000..eb5259d --- /dev/null +++ b/Assets/Scripts/Common/Inputs/InSignal.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6ec46caaac33c6c4cb90ef13ff2697b7 \ No newline at end of file diff --git a/Assets/Scripts/Common/Inputs/InputSource.cs b/Assets/Scripts/Common/Inputs/InputSource.cs index ec11e9d..92d82d9 100644 --- a/Assets/Scripts/Common/Inputs/InputSource.cs +++ b/Assets/Scripts/Common/Inputs/InputSource.cs @@ -27,21 +27,21 @@ public abstract class InputSource /// /// Пин кнопки на периферийной плате /// true если кнопка нажата в текущий момент - public abstract bool GetButton(ButtonPinMapping button); + public abstract bool GetButton(InSignal button); /// /// Проверяет, была ли кнопка нажата в начале текущего кадра. /// /// Пин кнопки на периферийной плате /// true только в первом кадре после нажатия кнопки - public abstract bool GetButtonDown(ButtonPinMapping button); + public abstract bool GetButtonDown(InSignal button); /// /// Проверяет, была ли кнопка отпущена в начале текущего кадра. /// /// Пин кнопки на периферийной плате /// true только в первом кадре после отпускания кнопки - public abstract bool GetButtonUp(ButtonPinMapping button); + public abstract bool GetButtonUp(InSignal button); //---------------------------------------------------------------------------------- diff --git a/Assets/Scripts/Common/Inputs/KeyboardInput.cs b/Assets/Scripts/Common/Inputs/KeyboardInput.cs index 3cc65e3..4f655fe 100644 --- a/Assets/Scripts/Common/Inputs/KeyboardInput.cs +++ b/Assets/Scripts/Common/Inputs/KeyboardInput.cs @@ -19,13 +19,13 @@ public class KeyboardInput : InputSource /// Проверяет состояние кнопки по её физическому пину через клавиатуру - public override bool GetButton(ButtonPinMapping button) => Input.GetKey(getKeyCode(button)); + public override bool GetButton(InSignal button) => Input.GetKey(getKeyCode(button)); /// Проверяет нажатие кнопки по пину в текущем кадре через клавиатуру - public override bool GetButtonDown(ButtonPinMapping button) => Input.GetKeyDown(getKeyCode(button)); + public override bool GetButtonDown(InSignal button) => Input.GetKeyDown(getKeyCode(button)); /// Проверяет отпускание кнопки по пину в текущем кадре через клавиатуру - public override bool GetButtonUp(ButtonPinMapping button) => Input.GetKeyUp(getKeyCode(button)); + public override bool GetButtonUp(InSignal button) => Input.GetKeyUp(getKeyCode(button)); //---------------------------------------------------------------------------------- @@ -76,7 +76,7 @@ public class KeyboardInput : InputSource /// Определяет кнопку текущего игрока для указанного действия. /// Для клавиатуры всегда возвращает кнопку первого игрока. /// - private ButtonPinMapping GetButtonForCurrentPlayer(PlayerAction button) + private InSignal GetButtonForCurrentPlayer(PlayerAction button) { var buttons = _buttonByAction(button); return currentPlayer == 1 ? buttons.player1button : buttons.player2button; @@ -85,7 +85,7 @@ public class KeyboardInput : InputSource /// /// Проверяет действие для обоих игроков используя указанную функцию проверки. /// - private bool CheckBothPlayers(PlayerAction action, System.Func buttonFunc) + private bool CheckBothPlayers(PlayerAction action, System.Func buttonFunc) { var buttons = _buttonByAction(action); return buttonFunc(buttons.player1button) || buttonFunc(buttons.player2button); @@ -94,46 +94,46 @@ public class KeyboardInput : InputSource /// /// Возвращает соответствие между игровыми действиями и физическими кнопками игроков. /// - private (ButtonPinMapping player1button, ButtonPinMapping player2button) _buttonByAction(PlayerAction playerAction) => + private (InSignal player1button, InSignal player2button) _buttonByAction(PlayerAction playerAction) => playerAction switch { - PlayerAction.up => (ButtonPinMapping.up1, ButtonPinMapping.up2), - PlayerAction.down => (ButtonPinMapping.down1, ButtonPinMapping.down2), - PlayerAction.left => (ButtonPinMapping.left1, ButtonPinMapping.left2), - PlayerAction.right => (ButtonPinMapping.right1, ButtonPinMapping.right2), - PlayerAction.action => (ButtonPinMapping.action1, ButtonPinMapping.action2), - PlayerAction.extra => (ButtonPinMapping.extra, ButtonPinMapping.extra), + PlayerAction.up => (InSignal.up1, InSignal.up2), + PlayerAction.down => (InSignal.down1, InSignal.down2), + PlayerAction.left => (InSignal.left1, InSignal.left2), + PlayerAction.right => (InSignal.right1, InSignal.right2), + PlayerAction.action => (InSignal.action1, InSignal.action2), + PlayerAction.extra => (InSignal.extra, InSignal.extra), _ => throw new System.ArgumentException($"Unknown player action: {playerAction}") }; /// /// Преобразует физический пин в соответствующую клавишу клавиатуры. /// - private KeyCode getKeyCode(ButtonPinMapping button) + private KeyCode getKeyCode(InSignal button) { return button switch { - ButtonPinMapping.up1 => KeyCode.W, - ButtonPinMapping.right1 => KeyCode.D, - ButtonPinMapping.down1 => KeyCode.S, - ButtonPinMapping.left1 => KeyCode.A, - ButtonPinMapping.action1 => KeyCode.Space, + InSignal.up1 => KeyCode.W, + InSignal.right1 => KeyCode.D, + InSignal.down1 => KeyCode.S, + InSignal.left1 => KeyCode.A, + InSignal.action1 => KeyCode.Space, - ButtonPinMapping.up2 => KeyCode.UpArrow, - ButtonPinMapping.right2 => KeyCode.RightArrow, - ButtonPinMapping.down2 => KeyCode.DownArrow, - ButtonPinMapping.left2 => KeyCode.LeftArrow, - ButtonPinMapping.action2 => KeyCode.RightControl, + InSignal.up2 => KeyCode.UpArrow, + InSignal.right2 => KeyCode.RightArrow, + InSignal.down2 => KeyCode.DownArrow, + InSignal.left2 => KeyCode.LeftArrow, + InSignal.action2 => KeyCode.RightControl, - ButtonPinMapping.startOnePlayer => KeyCode.Alpha1, - ButtonPinMapping.startTwoPlayers => KeyCode.Alpha2, + InSignal.startOnePlayer => KeyCode.Alpha1, + InSignal.startTwoPlayers => KeyCode.Alpha2, - ButtonPinMapping.secret => KeyCode.F5, + InSignal.secret => KeyCode.F5, - ButtonPinMapping.extra => KeyCode.Alpha3, + InSignal.extra => KeyCode.Alpha3, - ButtonPinMapping.hasPrize => KeyCode.O, - ButtonPinMapping.prizeGiven => KeyCode.P, + InSignal.hasPrize => KeyCode.O, + InSignal.prizeGiven => KeyCode.P, _ => KeyCode.None, }; diff --git a/Assets/Scripts/Common/Leaderboard/NumberInput.cs b/Assets/Scripts/Common/Leaderboard/NumberInput.cs index dd91719..de63d97 100644 --- a/Assets/Scripts/Common/Leaderboard/NumberInput.cs +++ b/Assets/Scripts/Common/Leaderboard/NumberInput.cs @@ -47,7 +47,6 @@ public class NumberInput : MonoBehaviour if (!string.IsNullOrEmpty(key) && saveDataOnClose) { PlayerPrefs.SetInt(key, currentValue); - SettingsManager.OnSettingsChanged?.Invoke(); } SoundManager.instance.playClip(acceptSound); return currentValue; diff --git a/Assets/Scripts/Common/Leaderboard/TextInput.cs b/Assets/Scripts/Common/Leaderboard/TextInput.cs deleted file mode 100644 index 8d0d591..0000000 --- a/Assets/Scripts/Common/Leaderboard/TextInput.cs +++ /dev/null @@ -1,290 +0,0 @@ -using System; -using System.Collections; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class TextInput : MonoBehaviour -{ - [Header("Ключ prefs")] - [SerializeField] private string key; - [SerializeField] private bool loadData; - [SerializeField] private bool saveDataOnClose; - - [Header("Настройки генерации поля")] - [Tooltip("Якорь лево-низ")][SerializeField] private GameObject SlotPrefab; - [SerializeField] private RectTransform slotsRoot; - [SerializeField] private int slotsCount = 10; - - [SerializeField] private float rootPaddingX = 10; - [SerializeField] private float rootPaddingY = 10; - [SerializeField] private float gapSize = 10; - - - [Header("Настройки анимации")] - - [SerializeField] private float animationSpeed; - - [SerializeField] private float fontSizeNormal = 20; - [SerializeField] private float fontSizeHighlighted = 25; - [SerializeField] private Color fontColorNormal; - [SerializeField] private Color fontColorHighlighted; - - [SerializeField] private float slotSizeMultiplier = 1.1f; - [SerializeField] private Color slotColorNormal; - [SerializeField] private Color slotColorHighlighted; - - [Header("Звуки")] - [SerializeField] private AudioClip switchSlotSound; - [SerializeField] private AudioClip switchLetterSound; - [SerializeField] private AudioClip acceptSound; - [SerializeField] private AudioClip openSound; - - - private Vector2 slotSizeNormal; //расчет при генерации - - [Header("Алфавит")] - [SerializeField] private string alphabetString = "0123456789"; //из него генерирует массив символов - - [Header("Скорость переключения букв")] - [SerializeField] private float MaxSpeedLetterPerSecond = 8; - [SerializeField] private float MinSpeedLetterPerSecond = 3; - [SerializeField] private float MaxSpeedTime = 3; - [SerializeField] private float MinSpeedTime = 0.5f; - - private float switchButtonPressedTime = 0; - private float letterSwitchSpeed = 0; - private float switchDelayRest = 1; - - - - - //тут массивы для доступа - private string[] alphabet; // не забыь добавить пустую строку при генерации (пробел лучше) - private RectTransform[] slotRects; - private Graphic[] slotGraphics; - private TextMeshProUGUI[] slotLabels; - - private Coroutine animationCoroutine; - - private int currentSlotIndex = 0; - private int currentLetterindex = 0; - - private TextMeshProUGUI currentLabel => slotLabels[currentSlotIndex]; - - - - - public void Initialize() - { - Generate(); - LoadSavedData(); - SoundManager.instance.playClip(openSound); - - animationCoroutine = StartCoroutine(SlotsAnimation()); - } - - public string AcceptAndClose() - { - string result = GetText(); - - if (!string.IsNullOrEmpty(key) && saveDataOnClose) - { - PlayerPrefs.SetString(key, result); - SettingsManager.OnSettingsChanged?.Invoke(); - } - - StopCoroutine(animationCoroutine); - SoundManager.instance.playClip(acceptSound); - Clear(); - return result; - - } - private void Generate() - { - //Считаем размер одного слота - Vector2 spaceForSlotsWithGaps = slotsRoot.sizeDelta - - Vector2.right * rootPaddingX * 2 - - Vector2.up * rootPaddingY * 2; - - int gapsCount = slotsCount - 1; - float horizontalSpaceForSlots = spaceForSlotsWithGaps.x - gapsCount * gapSize; - float slotWidth = horizontalSpaceForSlots / slotsCount; - - slotSizeNormal = new Vector2(slotWidth, - spaceForSlotsWithGaps.y); - - //Расставляем слоты в root - //у префаба будет якорь лево/низ - Vector2 startLocalPoint = new Vector2(rootPaddingX, rootPaddingY); - slotRects = new RectTransform[slotsCount]; - slotGraphics = new Graphic[slotsCount]; - slotLabels = new TextMeshProUGUI[slotsCount]; - - Vector2 slotOffset = (slotSizeNormal.x + gapSize) * Vector2.right;//на сколько сдвигать каждый след. слот - for (int i = 0; i < slotsCount; i++) - { - //Создаем слот - GameObject slot = Instantiate(SlotPrefab, slotsRoot); - - //филлим массивы ссылок - slotRects[i] = slot.GetComponent(); - slotGraphics[i] = slot.GetComponent(); - slotLabels[i] = slot.transform.GetComponentInChildren(); - - //Выставляем размеры, координаты, цвета, шрифты - slotRects[i].sizeDelta = slotSizeNormal; - slotRects[i].anchoredPosition = startLocalPoint + slotOffset * i + slotSizeNormal / 2; - - slotGraphics[i].color = slotColorNormal; - slotLabels[i].color = fontColorNormal; - slotLabels[i].text = ""; - - slotLabels[i].fontSize = fontSizeNormal; - } - - //Собираем алфавит - alphabet = new string[alphabetString.Length + 1];//+1 для пробела - for (int i = 0; i < alphabetString.Length; i++) - { - alphabet[i] = alphabetString[i].ToString(); - } - alphabet[^1] = " "; - - //Настраиваем индексы - currentSlotIndex = 0; - } - private void LoadSavedData() - { - string data = ""; - - if (loadData) - data = PlayerPrefs.GetString(key, ""); - - // Очищаем все слоты - for (int i = 0; i < slotsCount; i++) - { - slotLabels[i].text = " "; - } - - // Заполняем сохраненными данными - if (!string.IsNullOrEmpty(data)) - { - int minLength = Mathf.Min(data.Length, slotsCount); - for (int i = 0; i < minLength; i++) - { - slotLabels[i].text = data[i].ToString(); - } - } - } - - public void SwitchLetter(int continiousDirection) - { - continiousDirection = Mathf.Clamp(continiousDirection, -1, 1); - if (continiousDirection == 0)//сброс переключения - { - switchDelayRest = 0; - switchButtonPressedTime = 0; - return; - } - - if (switchDelayRest < 0) - { - - //переключение - currentLetterindex = (currentLetterindex + continiousDirection + alphabet.Length) % alphabet.Length; - currentLabel.text = alphabet[currentLetterindex]; - - recalculateRest(); - Debug.Log($"Переключение остаток: {switchDelayRest}"); - } - switchDelayRest -= Time.deltaTime; - switchButtonPressedTime += Time.deltaTime; - - - void recalculateRest() - { - float k = (MaxSpeedLetterPerSecond - MinSpeedLetterPerSecond) - / (MaxSpeedTime - MinSpeedTime); - float b = MinSpeedLetterPerSecond - k * MinSpeedTime; - letterSwitchSpeed = k * switchButtonPressedTime + b; - letterSwitchSpeed = Mathf.Clamp(letterSwitchSpeed, - MinSpeedLetterPerSecond, - MaxSpeedLetterPerSecond); - switchDelayRest = 1 / letterSwitchSpeed; - } - } - - public void SwitchSlot(int discreteDirection) - { - if (discreteDirection == 0) return; - - currentSlotIndex = (currentSlotIndex + discreteDirection + slotsCount) % slotsCount; - - string letter = currentLabel.text; - currentLetterindex = Array.IndexOf(alphabet, letter); - - - } - - public void Clear() - { - foreach (RectTransform rect in slotRects) - { - Destroy(rect.gameObject); - } - } - - public string GetText() - { - System.Text.StringBuilder sb = new(); - - foreach (TextMeshProUGUI label in slotLabels) - { - // Если текст пустой строка, считаем это пробелом - if (!string.IsNullOrEmpty(label.text)) - { - sb.Append(label.text); - } - } - return sb.ToString().Trim(); - } - - - IEnumerator SlotsAnimation() - { - float scaleSpeed = (slotSizeMultiplier - 1) / animationSpeed; - float slotColorSpeed = Vector4.Distance(slotColorNormal, slotColorHighlighted) / animationSpeed; - float fontColorSpeed = Vector4.Distance(fontColorNormal, fontColorHighlighted) / animationSpeed; - float fontSizeSpeed = (fontSizeHighlighted - fontSizeNormal) / animationSpeed; - - while (true) - { - for (int i = 0; i < slotsCount; i++) - { - if (i == currentSlotIndex) //подсвечиваем - { - slotRects[i].localScale = Vector3.MoveTowards(slotRects[i].localScale, Vector3.one * slotSizeMultiplier, scaleSpeed); - slotGraphics[i].color = Vector4.MoveTowards(slotGraphics[i].color, slotColorHighlighted, slotColorSpeed); - - slotLabels[i].color = Vector4.MoveTowards(slotLabels[i].color, fontColorHighlighted, fontColorSpeed); - slotLabels[i].fontSize = Mathf.MoveTowards(slotLabels[i].fontSize, fontSizeHighlighted, fontSizeSpeed); - - } - else //убираем подсветку - { - slotRects[i].localScale = Vector3.MoveTowards(slotRects[i].localScale, Vector3.one, scaleSpeed); - slotGraphics[i].color = Vector4.MoveTowards(slotGraphics[i].color, slotColorNormal, slotColorSpeed); - - slotLabels[i].color = Vector4.MoveTowards(slotLabels[i].color, fontColorNormal, fontColorSpeed); - slotLabels[i].fontSize = Mathf.MoveTowards(slotLabels[i].fontSize, fontSizeNormal, fontSizeSpeed); - } - } - - - yield return null; - } - - } - -} diff --git a/Assets/Scripts/Common/PaymentSystem/PaymentSystem.cs b/Assets/Scripts/Common/PaymentSystem/PaymentSystem.cs index 8a330ed..f84c751 100644 --- a/Assets/Scripts/Common/PaymentSystem/PaymentSystem.cs +++ b/Assets/Scripts/Common/PaymentSystem/PaymentSystem.cs @@ -24,8 +24,8 @@ public static class PaymentSystem Balance = LoadBalance(); ComWrapper.PaymentReceived += AddCredit; - PullSettings(); - SettingsManager.OnSettingsChanged.AddListener(PullSettings); + ApplySettings(); + SettingsManager.OnSettingsChanged += ApplySettings; } public static bool TryPay(int amount) @@ -58,7 +58,7 @@ public static class PaymentSystem PlayerPrefs.SetInt(PrefsKeyVault.CASH_COUNTER, PlayerPrefs.GetInt(PrefsKeyVault.CASH_COUNTER) + ValutaPerImpulse); PlayerPrefs.SetInt(PrefsKeyVault.CASH_COUNTER_NUL, PlayerPrefs.GetInt(PrefsKeyVault.CASH_COUNTER_NUL) + ValutaPerImpulse); - if (SettingsManager.GetString("BaseBotDifficulty", "Фиксированная") == "Повышенная") + if (SettingsManager.GetString(SettingKey.DIFFICULTY_MODE) == "Заработок") { IncrementPulsesCounter(); } @@ -68,9 +68,7 @@ public static class PaymentSystem public static void ReturnCredits(GameMode gameMode) { - string gamemodePriceKey = gameMode == GameMode.pvp ? "PricePVP" : "PricePVE"; - int gamemodePrice = PlayerPrefs.GetInt(gamemodePriceKey, 10); - + int gamemodePrice = gameMode == GameMode.pvp ? PricePvp : PricePve; ChangeBalance(gamemodePrice); } @@ -80,15 +78,15 @@ public static class PaymentSystem ChangeBalance(delta); } - private static void PullSettings() + private static void ApplySettings() { - Freeplay = SettingsManager.GetBool("Freeplay", false); + Freeplay = SettingsManager.GetBool(SettingKey.FREEPLAY); ValutaPerImpulse = PlayerPrefs.GetInt("ValutaPerImpulse", 10); ValutaName = PlayerPrefs.GetString("ValutaName", "руб."); - PricePve = PlayerPrefs.GetInt("PricePVE", 10); - PricePvp = PlayerPrefs.GetInt("PricePVP", 10); - PriceRevenge = PlayerPrefs.GetInt("PriceRevenge", 10); + PricePve = SettingsManager.GetInt(SettingKey.PRICE_PVE); + PricePvp = SettingsManager.GetInt(SettingKey.PRICE_PVP); + PriceRevenge = SettingsManager.GetInt(SettingKey.PRICE_REVENGE); PulsesCounter = PlayerPrefs.GetInt("PulsesCounter", 0); } diff --git a/Assets/Scripts/Common/PrefsKeyVault.cs b/Assets/Scripts/Common/PrefsKeyVault.cs index 561a457..9cddde3 100644 --- a/Assets/Scripts/Common/PrefsKeyVault.cs +++ b/Assets/Scripts/Common/PrefsKeyVault.cs @@ -6,9 +6,6 @@ public const string NUMBER_TECH = "NumberTech"; public const string PRIZE_ERROR = "PrizeError"; - public const string PRICE_PVE = "PricePVE"; - public const string PRICE_PVP = "PricePVP"; - //счетчики public const string CASH_COUNTER = "STARTS"; public const string CASH_COUNTER_NUL = "STARTSNUL"; diff --git a/Assets/Scripts/Common/PrizeSystem/Config menu/CharacterPrizeConfigurator.cs b/Assets/Scripts/Common/PrizeSystem/Config menu/CharacterPrizeConfigurator.cs index 65a03e5..925a379 100644 --- a/Assets/Scripts/Common/PrizeSystem/Config menu/CharacterPrizeConfigurator.cs +++ b/Assets/Scripts/Common/PrizeSystem/Config menu/CharacterPrizeConfigurator.cs @@ -101,11 +101,11 @@ namespace PrizeSystem if (In.GetButtonAnyPlayer(PlayerAction.right)) Direction += 1; if (In.GetButtonAnyPlayer(PlayerAction.left)) Direction -= 1; - bool Switch = In.GetButtonDown(ButtonPinMapping.down1); + bool Switch = In.GetButtonDown(InSignal.down1); - bool NextPanel = In.GetButtonDown(ButtonPinMapping.down2); + bool NextPanel = In.GetButtonDown(InSignal.down2); - bool HoldExit = In.GetButton(ButtonPinMapping.startOnePlayer) && In.GetButton(ButtonPinMapping.startTwoPlayers); + bool HoldExit = In.GetButton(InSignal.startOnePlayer) && In.GetButton(InSignal.startTwoPlayers); return (Direction, Switch, NextPanel, HoldExit); } @@ -159,7 +159,7 @@ namespace PrizeSystem //Кэшнуть текущего персонажа prizesCache[characterPanel.CharacterIndex] = prizePanel.GetPrize(); PrizeSerializer.SavePrizes(prizesCache); - CharacterController.I.RefreshPrizes(); + CharactersController.I.RefreshPrizes(); } private void Exit() diff --git a/Assets/Scripts/Common/PrizeSystem/Config menu/Controls/CharacterSelectionPanel.cs b/Assets/Scripts/Common/PrizeSystem/Config menu/Controls/CharacterSelectionPanel.cs index 18d0682..14f26fe 100644 --- a/Assets/Scripts/Common/PrizeSystem/Config menu/Controls/CharacterSelectionPanel.cs +++ b/Assets/Scripts/Common/PrizeSystem/Config menu/Controls/CharacterSelectionPanel.cs @@ -1,4 +1,4 @@ -using System; +using System; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -26,7 +26,7 @@ public class CharacterSelectionPanel : MonoBehaviour, IControl private void OnEnable() { - characters = CharacterController.I.characters; + characters = CharactersController.GetCharactersArray(); CharacterIndex = 0; DisplaySelectedCharacter(); } diff --git a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Prefabs/QrTextInput.cs b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Prefabs/QrTextInput.cs index 283fd82..5debb5f 100644 --- a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Prefabs/QrTextInput.cs +++ b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Prefabs/QrTextInput.cs @@ -84,8 +84,8 @@ public class QrTextInput : MonoBehaviour private void Update() { - bool left = In.GetButton(ButtonPinMapping.left1); - bool right = In.GetButton(ButtonPinMapping.right1); + bool left = In.GetButton(InSignal.left1); + bool right = In.GetButton(InSignal.right1); if (!(left || right)) { diff --git a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/QrPrizeInput.cs b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/QrPrizeInput.cs index 4fd4b6d..7feb1fc 100644 --- a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/QrPrizeInput.cs +++ b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/QrPrizeInput.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using TMPro; using UnityEngine.UI; @@ -43,7 +43,7 @@ namespace PrizeSystem public override void ChangeOption(int direction) { - // + //Смена опции if (currentOption == SelectedOption.Rank) currentOption = SelectedOption.Text; else if ((currentOption == SelectedOption.Text)) currentOption = SelectedOption.Rank; @@ -79,14 +79,14 @@ namespace PrizeSystem else if (currentOption == SelectedOption.Text) { int leftDirection = 0; - if (In.GetButton(ButtonPinMapping.left1)) leftDirection -= 1; - if (In.GetButton(ButtonPinMapping.right1)) leftDirection += 1; + if (In.GetButton(InSignal.left1)) leftDirection -= 1; + if (In.GetButton(InSignal.right1)) leftDirection += 1; int rightDirection = 0; - if (In.GetButtonDown(ButtonPinMapping.left2)) rightDirection -= 1; - if (In.GetButtonDown(ButtonPinMapping.right2)) rightDirection += 1; + if (In.GetButtonDown(InSignal.left2)) rightDirection -= 1; + if (In.GetButtonDown(InSignal.right2)) rightDirection += 1; - // + //ТЕПЕРЬ НАДО ВОТ ЭТИ ИНПУТЫ ПРОКИНУТЬ ДАЛЬШЕ textInput.SwitchLetter(leftDirection); textInput.SwitchSlot(rightDirection); } diff --git a/Assets/Scripts/Common/PrizeSystem/PrizeSerializer.cs b/Assets/Scripts/Common/PrizeSystem/PrizeSerializer.cs index d3c0fda..a71f149 100644 --- a/Assets/Scripts/Common/PrizeSystem/PrizeSerializer.cs +++ b/Assets/Scripts/Common/PrizeSystem/PrizeSerializer.cs @@ -12,7 +12,7 @@ namespace PrizeSystem { const string CHARACTERS_PRIZES = "CharPrizes.prizRR"; static string FILE_PATH => Path.Combine(Application.persistentDataPath, CHARACTERS_PRIZES); - static int CharactersAmount => GameManager.instance.botsAmount; + static int CharactersAmount => 5; public static List LoadPrizes() { diff --git a/Assets/Scripts/Common/PrizeSystem/PrizeSystemManager.cs b/Assets/Scripts/Common/PrizeSystem/PrizeSystemManager.cs index f8b04ed..27e88ce 100644 --- a/Assets/Scripts/Common/PrizeSystem/PrizeSystemManager.cs +++ b/Assets/Scripts/Common/PrizeSystem/PrizeSystemManager.cs @@ -82,7 +82,7 @@ namespace PrizeSystem Debug.Log("Приз Null"); return; } //Если призы отключены в принципе, то не выдаем. - bool prizingEnabled = SettingsManager.GetBool("Prizing", false); + bool prizingEnabled = SettingsManager.GetBool(SettingKey.PRIZING); if (!prizingEnabled) return; @@ -129,7 +129,7 @@ namespace PrizeSystem for (int i = 0; i < amount; i++) { - bool noPrizWhenError = SettingsManager.GetBool("PrizingWhenError", true); + bool noPrizWhenError = SettingsManager.GetBool(SettingKey.PRIZING_WHEN_ERROR); bool errorRegistred = PlayerPrefs.GetInt(PrefsKeyVault.PRIZING_ERROR_REGISTRED, 0) == 1; if (errorRegistred && noPrizWhenError) yield break; diff --git a/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs b/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs index 16eca3f..c8a9180 100644 --- a/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs +++ b/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs @@ -39,12 +39,12 @@ namespace PrizeSystem void Update() { - if(In.GetButtonDown(ButtonPinMapping.startOnePlayer)) + if(In.GetButtonDown(InSignal.startOnePlayer)) { SelectedOption = TakeOrRiskOption.Take; Accept(); } - if (In.GetButtonDown(ButtonPinMapping.startTwoPlayers)) + if (In.GetButtonDown(InSignal.startTwoPlayers)) { SelectedOption = TakeOrRiskOption.Risk; Accept(); diff --git a/Assets/Scripts/Common/PrizeSystem/VitrinaView.cs b/Assets/Scripts/Common/PrizeSystem/VitrinaView.cs index 3b8f463..4eb4e9d 100644 --- a/Assets/Scripts/Common/PrizeSystem/VitrinaView.cs +++ b/Assets/Scripts/Common/PrizeSystem/VitrinaView.cs @@ -40,8 +40,8 @@ public class VitrinaView : MonoBehaviour return; } - bool hasPrize = CharacterController.CurrentCharacter.HasPrize; - if (hasPrize && CharacterController.CurrentCharacter.prize is VitrinaPrize vitrinaPrize) + bool hasPrize = CharactersController.CurrentCharacter.HasPrize; + if (hasPrize && CharactersController.CurrentCharacter.prize is VitrinaPrize vitrinaPrize) { gameObject.SetActive(true); diff --git a/Assets/Scripts/Common/Server/AuthManager.cs b/Assets/Scripts/Common/Server/AuthManager.cs deleted file mode 100644 index c8e03ec..0000000 --- a/Assets/Scripts/Common/Server/AuthManager.cs +++ /dev/null @@ -1,172 +0,0 @@ -using System; -using System.IO; -using System.Net; -using System.Security.Cryptography; -using System.Text; -using UnityEngine; - -public static class AuthManager -{ - private const string CookieName = "fishka_auth"; - private const string TokenSeparator = "."; - private const string AppSalt = "FISHKA_WEB_ADMIN_V1"; // поменяй на своё - - public static bool VerifyPassword(string entered, string actual) - { - if (entered == null) entered = ""; - if (actual == null) actual = ""; - return ConstantTimeEquals(entered, actual); - } - - public static bool IsAuthorized(HttpListenerRequest request, string password) - { - try - { - var cookie = request.Cookies?[CookieName]; - if (cookie == null || string.IsNullOrEmpty(cookie.Value)) return false; - return ValidateToken(cookie.Value, password); - } - catch - { - return false; - } - } - - public static void SetAuthCookie(HttpListenerResponse response, string token, int daysValid) - { - // Cookie через header руками, чтобы не упираться в SameSite API разных .NET в Unity - int maxAge = Mathf.Clamp(daysValid, 1, 3650) * 24 * 60 * 60; - string header = $"{CookieName}={token}; Path=/; Max-Age={maxAge}; HttpOnly; SameSite=Lax"; - response.Headers.Add("Set-Cookie", header); - } - - public static string GenerateToken(string password, int daysValid) - { - long exp = DateTimeOffset.UtcNow.AddDays(daysValid).ToUnixTimeSeconds(); - string nonce = Guid.NewGuid().ToString("N"); - string payload = $"{exp}:{nonce}"; - byte[] sig = HmacSha256(GetSecretKey(password), payload); - return Base64UrlEncode(Encoding.UTF8.GetBytes(payload)) + TokenSeparator + Base64UrlEncode(sig); - } - - private static bool ValidateToken(string token, string password) - { - if (string.IsNullOrEmpty(token)) return false; - - var parts = token.Split(new[] { TokenSeparator }, StringSplitOptions.None); - if (parts.Length != 2) return false; - - byte[] payloadBytes, sigBytes; - try - { - payloadBytes = Base64UrlDecode(parts[0]); - sigBytes = Base64UrlDecode(parts[1]); - } - catch { return false; } - - string payload = Encoding.UTF8.GetString(payloadBytes); - byte[] expected = HmacSha256(GetSecretKey(password), payload); - - if (!FixedTimeEquals(sigBytes, expected)) return false; - - // exp - var idx = payload.IndexOf(':'); - if (idx <= 0) return false; - - if (!long.TryParse(payload.Substring(0, idx), out long exp)) return false; - long now = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); - if (now > exp) return false; - - return true; - } - - private static byte[] GetSecretKey(string password) - { - // Если поменяешь пароль — старые куки станут невалидными (это плюс). - string s = $"{AppSalt}:{password}"; - return Sha256(Encoding.UTF8.GetBytes(s)); - } - - private static byte[] Sha256(byte[] data) - { - using var sha = SHA256.Create(); - return sha.ComputeHash(data); - } - - private static byte[] HmacSha256(byte[] key, string data) - { - using var h = new HMACSHA256(key); - return h.ComputeHash(Encoding.UTF8.GetBytes(data)); - } - - // Достаём пароль из body: либо form-url-encoded (password=...), либо json {"password":"..."} - public static string ExtractPassword(string body, string contentType) - { - if (string.IsNullOrEmpty(body)) return ""; - - contentType = (contentType ?? "").ToLower(); - - if (contentType.Contains("application/json")) - { - // очень простой парсер под {"password":"..."} - // если хочешь — можно заменить на DTO+JsonUtility - const string key = "\"password\""; - int i = body.IndexOf(key, StringComparison.OrdinalIgnoreCase); - if (i < 0) return ""; - int colon = body.IndexOf(':', i); - if (colon < 0) return ""; - int q1 = body.IndexOf('"', colon + 1); - if (q1 < 0) return ""; - int q2 = body.IndexOf('"', q1 + 1); - if (q2 < 0) return ""; - return body.Substring(q1 + 1, q2 - q1 - 1); - } - - // form - try - { - var nvc = System.Web.HttpUtility.ParseQueryString(body, Encoding.UTF8); - return nvc["password"] ?? ""; - } - catch - { - return ""; - } - } - - private static string Base64UrlEncode(byte[] data) - { - return Convert.ToBase64String(data) - .TrimEnd('=') - .Replace('+', '-') - .Replace('/', '_'); - } - - private static byte[] Base64UrlDecode(string s) - { - s = s.Replace('-', '+').Replace('_', '/'); - switch (s.Length % 4) - { - case 2: s += "=="; break; - case 3: s += "="; break; - } - return Convert.FromBase64String(s); - } - - private static bool ConstantTimeEquals(string a, string b) - { - var ba = Encoding.UTF8.GetBytes(a); - var bb = Encoding.UTF8.GetBytes(b); - return FixedTimeEquals(ba, bb); - } - - private static bool FixedTimeEquals(byte[] a, byte[] b) - { - if (a == null || b == null) return false; - if (a.Length != b.Length) return false; - int diff = 0; - for (int i = 0; i < a.Length; i++) - diff |= a[i] ^ b[i]; - return diff == 0; - } -} diff --git a/Assets/Scripts/Common/Server/AuthManager.cs.meta b/Assets/Scripts/Common/Server/AuthManager.cs.meta deleted file mode 100644 index ec6e744..0000000 --- a/Assets/Scripts/Common/Server/AuthManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: be4e78088aed1e049a925227fdc3b2da -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Server/CountersCollector.cs b/Assets/Scripts/Common/Server/CountersCollector.cs deleted file mode 100644 index f7245b9..0000000 --- a/Assets/Scripts/Common/Server/CountersCollector.cs +++ /dev/null @@ -1,100 +0,0 @@ -using PrizeSystem; -using System.Collections.Concurrent; -using System.Collections.Generic; -using UnityEngine; - -public class CountersCollector : MonoBehaviour -{ - public static ConcurrentDictionary Counters = new(); - - public void Initialize() - { - InvokeRepeating("Refresh", 0, 5); - } - - private static readonly CounterData[] _counterConfigs = - { - // Призовые счетчики глобальные - new CounterData(PrefsKeyVault.HOPPER_GIVEN_COUNTER, "Хоппер", 0), - new CounterData(PrefsKeyVault.TICKET_GIVEN_COUNTER, "Тикетник", 0), - new CounterData(PrefsKeyVault.MARBLES_GIVEN_COUNTER, "Марблс", 0), - new CounterData(PrefsKeyVault.SPECIAL_GIVEN_COUNTER, "Суперприз", 0), - - // Призовые счетчики обнуляемые - new CounterData($"{PrefsKeyVault.HOPPER_GIVEN_COUNTER}Nullable", "Хоппер (обнуляемый)", 0), - new CounterData($"{PrefsKeyVault.TICKET_GIVEN_COUNTER}Nullable", "Тикетник (обнуляемый)", 0), - new CounterData($"{PrefsKeyVault.MARBLES_GIVEN_COUNTER}Nullable", "Марблс (обнуляемый)", 0), - new CounterData($"{PrefsKeyVault.SPECIAL_GIVEN_COUNTER}Nullable", "Суперприз (обнуляемый)", 0), - - // Выручка - new CounterData(PrefsKeyVault.CASH_COUNTER, "Выручка", 0), - new CounterData(PrefsKeyVault.CASH_COUNTER_NUL, "Выручка (обнуляемый)", 0), - - // Остаток призов - new CounterData(PrefsKeyVault.PRIZES_AVAILABLE, "Остаток призов", 0), - - // Цены - new CounterData("PricePVP", "Цена на двоих", 10), - new CounterData("PricePVE", "Цена против бота", 10), - new CounterData("PriceRevenge", "Цена реванша", 10), - - // Расчеты - new CounterData("ValutaName", "Название валюты", "руб."), - new CounterData("ValutaPerImpulse", "Валюта за импульс", 10), - - // Другое - new CounterData("Number", "Номер телефона", "<не указан>"), - - }; - - - void Refresh() - { - Counters.Clear(); - foreach (var config in _counterConfigs) - { - AddCounter(config); - } - } - void AddCounter(CounterData counterData) - { - string value = counterData.Type == SettingType.Int - ? PlayerPrefs.GetInt(counterData.PrefsKey, counterData.DefaultIntValue).ToString() - : PlayerPrefs.GetString(counterData.PrefsKey, counterData.DefaultStringValue); - - Counters[counterData.Alias] = value; - } - struct CounterData - { - public string PrefsKey; - public string Alias; - - public SettingType Type; - public string DefaultStringValue; - public int DefaultIntValue; - - - - /// Конструктор для строковых счетчиков - public CounterData(string prefsKey, string alias, string defaultValue) - { - PrefsKey = prefsKey; - Alias = alias; - - Type = SettingType.String; - DefaultStringValue = defaultValue; - DefaultIntValue = 0; - } - - /// Конструктор для целочисленных счетчиков - public CounterData(string prefsKey, string alias, int defaultValue) - { - PrefsKey = prefsKey; - Alias = alias; - - Type = SettingType.Int; - DefaultStringValue = string.Empty; - DefaultIntValue = defaultValue; - } - } -} diff --git a/Assets/Scripts/Common/Server/CountersCollector.cs.meta b/Assets/Scripts/Common/Server/CountersCollector.cs.meta deleted file mode 100644 index 2c6a7c6..0000000 --- a/Assets/Scripts/Common/Server/CountersCollector.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8335100aebab3444a89736e47c763b4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Server/HtmlBuilder.cs b/Assets/Scripts/Common/Server/HtmlBuilder.cs deleted file mode 100644 index 764ec3a..0000000 --- a/Assets/Scripts/Common/Server/HtmlBuilder.cs +++ /dev/null @@ -1,462 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; - -public class HtmlBuilder -{ - // старый метод оставим, чтобы ничего не поломать - public static string GetSettingsPage(List settings) - => GetSettingsPage(settings, actions: null); - - // новый метод - public static string GetSettingsPage(List settings, List actions) - { - return Decorate(GetSettingsString(settings, actions), title: "Настройки Фишки"); - } - - public static string GetLoginPage() - { - string content = @" - - - -"; - return Decorate(content, title: "Вход"); - } - - // старый метод оставим - public static string GetSettingsString(List settings) - => GetSettingsString(settings, actions: null); - - // новый метод: настройки + действия (раздельные блоки) - public static string GetSettingsString(List settings, List actions) - { - var sb = new StringBuilder(); - - sb.AppendLine("

Настройки фишки

"); - - // === БЛОК: АКТИВНЫЕ ПАРАМЕТРЫ (CountersCollector.Counters) === - sb.AppendLine(GetActiveCountersBlock()); - - - // === БЛОК: НАСТРОЙКИ === - sb.AppendLine(@" -
- Настройки -
-"); - - // монеты внутри настроек - sb.AppendLine(@" -
-

Монеты

-
- - -
-
-
-"); - - sb.AppendLine("
"); - sb.AppendLine("

Параметры

"); - - foreach (Setting setting in settings) - { - string view = setting.Type switch - { - SettingType.Bool => GetBoolView(setting), - SettingType.Float => GetFloatView(setting), - SettingType.String => GetStringView(setting), - SettingType.Int => GetIntView(setting), - _ => $"

{Escape(setting.Alias)}: (unknown)

" - }; - sb.AppendLine(view); - } - - sb.AppendLine("
"); // panel - sb.AppendLine(@" -
-
-"); - - // === БЛОК: ДЕЙСТВИЯ === - sb.AppendLine(@" -
- Действия -
-"); - sb.AppendLine(GetActionsView(actions)); - sb.AppendLine(@" -
-
-"); - - // JS: realtime settings + coins + actions - sb.AppendLine(@" - - -
-"); - - return sb.ToString(); - } - - private static string GetActionsView(List actions) - { - var sb = new StringBuilder(); - - if (actions == null || actions.Count == 0) - { - sb.AppendLine("

Нет доступных действий

"); - return sb.ToString(); - } - - // группировка по Group (если пусто — в "Другое") - var groups = actions - .Where(a => a != null && !string.IsNullOrWhiteSpace(a.Name)) - .GroupBy(a => string.IsNullOrWhiteSpace(a.Group) ? "Другое" : a.Group); - - foreach (var g in groups) - { - sb.AppendLine($"
"); - sb.AppendLine($"

{Escape(g.Key)}

"); - sb.AppendLine("
"); - - foreach (var a in g) - { - sb.AppendLine( - $" " - ); - } - - sb.AppendLine("
"); - sb.AppendLine("
"); - } - - return sb.ToString(); - } - - private static string GetBoolView(Setting setting) - { - string name = setting.Id; - string id = name + "ID"; - - string isChecked = setting.BoolValue ? "checked" : ""; - - return $@" -
- - -
"; - } - - private static string GetFloatView(Setting setting) - { - string name = setting.Id; - string id = name + "ID"; - string spanId = id + "_VAL"; - - string min = setting.FloatMin.ToString(CultureInfo.InvariantCulture); - string max = setting.FloatMax.ToString(CultureInfo.InvariantCulture); - string value = setting.FloatValue.ToString(CultureInfo.InvariantCulture); - string step = setting.FloatStep.ToString(CultureInfo.InvariantCulture); - - return $@" -
- - -
"; - } - - private static string GetStringView(Setting setting) - { - var sb = new StringBuilder(); - sb.AppendLine("
"); - sb.AppendLine($"

{Escape(setting.Alias)}

"); - - for (int i = 0; i < setting.AllowedValues.Count; i++) - { - string stringValue = setting.AllowedValues[i]; - string name = setting.Id; - string id = name + "ID" + i; - - bool isChecked = setting.StringValue == stringValue; - string Checked = isChecked ? "checked" : ""; - - sb.AppendLine("
"); - sb.AppendLine($""); - sb.AppendLine( - $"" - ); - sb.AppendLine("
"); - } - - sb.AppendLine("
"); - return sb.ToString(); - } - - private static string GetIntView(Setting setting) - { - string name = setting.Id; - string id = name + "ID"; - - return $@" -
- - -
"; - } - - private static string Decorate(string content, string title) - { - string res = "" - + "" - + "" - + "" - + "" - + "" - + $"{Escape(title)}" - + "" - + ""; - - res += content; - res += ""; - return res; - } - - private static string GetActiveCountersBlock() - { - var sb = new StringBuilder(); - - sb.AppendLine(@" -
- Активные параметры -
-
-

Активные параметры

-"); - - // CountersCollector.Counters : ConcurrentDictionary - var dict = CountersCollector.Counters; - - if (dict == null || dict.IsEmpty) - { - sb.AppendLine("
Нет данных
"); - } - else - { - // Стабильный вывод: снимок + сортировка по ключу - var items = dict.ToArray() - .OrderBy(kv => kv.Key ?? "", StringComparer.Ordinal); - - foreach (var kv in items) - { - string key = kv.Key ?? ""; - string val = kv.Value ?? ""; - - sb.AppendLine(@" -
"); - sb.AppendLine($" "); - sb.AppendLine($"
{Escape(val)}
"); - sb.AppendLine("
"); - } - } - - sb.AppendLine(@" -
-
-
-"); - - return sb.ToString(); - } - - - - private static string Escape(string s) - { - if (string.IsNullOrEmpty(s)) return ""; - return s.Replace("&", "&").Replace("<", "<").Replace(">", ">").Replace("\"", """); - } - - private static string EscapeAttr(string s) => Escape(s).Replace("'", "'"); -} \ No newline at end of file diff --git a/Assets/Scripts/Common/Server/HtmlBuilder.cs.meta b/Assets/Scripts/Common/Server/HtmlBuilder.cs.meta deleted file mode 100644 index d84ba54..0000000 --- a/Assets/Scripts/Common/Server/HtmlBuilder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2ae14f48ff7a1c6449a4e081676bae81 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Server/SettingsApplier.cs b/Assets/Scripts/Common/Server/SettingsApplier.cs deleted file mode 100644 index fd78a83..0000000 --- a/Assets/Scripts/Common/Server/SettingsApplier.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using UnityEngine; - -public static class SettingsApplier -{ - public static (bool OK, string log) ApplySettings( - Dictionary keyValuePairs, - bool assumeMissingBoolOff - ) - { - List settings = SettingsManager.Container.Settings; - - foreach (var kv in keyValuePairs) - { - var searchResult = GetSettingById(kv.Key, settings); - if (searchResult.found) - InjectNewValueToSetting(kv.Value, searchResult.setting); - } - - // ВАЖНО: - // - true: старое поведение для submit формы — то чего нет в POST, считаем false. - // - false: новое поведение для realtime — ничего не трогаем кроме пришедшего id. - if (assumeMissingBoolOff) - { - foreach (string id in FalseBoolSettingIds(settings, keyValuePairs.Keys.ToList())) - { - InjectNewValueToSetting("off", GetSettingById(id, settings).setting); - } - } - - return (OK: true, log: ""); - } - - private static (bool found, Setting setting) GetSettingById(string settingId, List settings) - { - Setting setting = settings.Find(s => s.Id == settingId); - if (setting != null) - return (found: true, setting); - else - return (found: false, setting); - } - - private static void InjectNewValueToSetting(string newValue, Setting setting) - { - if (setting == null) return; - - if (setting.Type == SettingType.String) - { - if (setting.AllowedValues.Contains(newValue)) - setting.StringValue = newValue; - else - Debug.Log($"{setting.Id}: недопустимое значение \"{newValue}\""); - } - else if (setting.Type == SettingType.Float) - { - if (!float.TryParse(newValue, NumberStyles.Float, CultureInfo.InvariantCulture, out float value)) - { - Debug.Log($"{setting.Id}: ошибка парсинга float \"{newValue}\""); - return; - } - - if (value <= setting.FloatMax && value >= setting.FloatMin) - setting.FloatValue = value; - else - Debug.Log($"{setting.Id}: float вне диапазона \"{newValue}\""); - } - else if (setting.Type == SettingType.Bool) - { - setting.BoolValue = (newValue == "on" || newValue == "true" || newValue == "1"); - } - else if (setting.Type == SettingType.Int) - { - if (int.TryParse(newValue, out int iv)) - setting.IntValue = iv; - else - Debug.Log($"{setting.Id}: ошибка парсинга int \"{newValue}\""); - } - } - - private static List FalseBoolSettingIds(List settings, List entry) - { - var missing = new List(); - foreach (Setting setting in settings) - { - if (entry.Contains(setting.Id)) continue; - missing.Add(setting.Id); - } - - var boolIds = new List(); - foreach (string id in missing) - { - var searchResult = GetSettingById(id, settings); - if (searchResult.found && searchResult.setting.Type == SettingType.Bool) - boolIds.Add(id); - } - - return boolIds; - } -} diff --git a/Assets/Scripts/Common/Server/SettingsApplier.cs.meta b/Assets/Scripts/Common/Server/SettingsApplier.cs.meta deleted file mode 100644 index 0bf6319..0000000 --- a/Assets/Scripts/Common/Server/SettingsApplier.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 78f41347e105b8f4b8169ae7179e0df7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Server/WebServer.cs b/Assets/Scripts/Common/Server/WebServer.cs deleted file mode 100644 index 8682f3f..0000000 --- a/Assets/Scripts/Common/Server/WebServer.cs +++ /dev/null @@ -1,527 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using UnityEngine; - -//Зависит от SettingsManager -[System.Serializable] -public class ServerResponse -{ - public string message; - public string timestamp; -} - -public class WebServer : MonoBehaviour -{ - private HttpListener listener; - private bool isRunning = true; - - private static byte[] css; - - private string AdminPassword; - - - public List settingActions; - - - async void Start() - { - if (ConfigManager.Config.StartServer == false) - { - //Debug.Log("Web сервер не запущен (по настройке)"); - return; - } - - AdminPassword = ConfigManager.Config.ServerPassword; - LoadCss(); - - settingActions = GameManager.instance.AdminPanel.GetComponent().settingActions; - - await StartWebServerAsync(); - } - - async Task StartWebServerAsync() - { - listener = new HttpListener(); - listener.Prefixes.Add("http://localhost:8080/"); - listener.Prefixes.Add("http://*:8080/"); - - listener.Start(); - Debug.Log("Async Web сервер запущен"); - - while (isRunning) - { - try - { - var context = await listener.GetContextAsync(); - _ = Task.Run(() => ProcessRequestAsync(context)); - } - catch (Exception e) - { - Debug.LogError($"Ошибка: {e.Message}"); - } - } - } - - async Task ProcessRequestAsync(HttpListenerContext context) - { - try - { - string path = context.Request.Url.LocalPath; - string method = context.Request.HttpMethod; - - // Debug.Log($"Запрос: {method} {path}"); - - // Публичные маршруты (без авторизации) - if (method == "GET" && path == "/style.css") - { - await HandleCssRequestAsync(context); - return; - } - - if (method == "GET" && path == "/login") - { - SendHtmlResponse(context, HtmlBuilder.GetLoginPage()); - return; - } - - if (method == "POST" && path == "/api/login") - { - await HandlePostLoginAsync(context); - return; - } - - // Дальше всё — только с авторизацией - if (!AuthManager.IsAuthorized(context.Request, AdminPassword)) - { - // красивый редирект на /login - Redirect(context, "/login"); - return; - } - - // Главная страница - if (method == "GET" && path == "/") - { - await HandleGetSettingsAsync(context); - return; - } - - // Рилтайм апдейт 1 настройки - if (method == "POST" && path == "/api/setting") - { - await HandlePostSingleSettingAsync(context); - return; - } - - // Кнопка "Добавить монеты" - if (method == "POST" && path == "/api/coins") - { - await HandlePostCoinsAsync(context); - return; - } - - // LEGACY (оставил, если вдруг где-то дергается) - if (method == "POST" && path == "/upd") - { - await HandlePostUpdateAsync(context); - return; - } - - if (method == "POST" && path == "/api/action") - { - await HandlePostActionAsync(context); - return; - } - - SendHtmlResponse(context, "

404 Not Found

", 404); - } - catch (Exception ex) - { - Debug.LogError($"Error processing request: {ex.Message}"); - SendHtmlResponse(context, $"

Error: {ex.Message}

", 500); - } - } - - async Task HandleGetSettingsAsync(HttpListenerContext context) - { - await Task.Run(() => - { - try - { - var stopwatch = System.Diagnostics.Stopwatch.StartNew(); - - var htmlTask = Task.Run(() => - { - var actionsSnapshot = settingActions != null ? new List(settingActions) : new List(); - return HtmlBuilder.GetSettingsPage(SettingsManager.Container.Settings, actionsSnapshot); - }); - - if (htmlTask.Wait(TimeSpan.FromSeconds(5))) - { - string htmlContent = htmlTask.Result; - stopwatch.Stop(); - - if (string.IsNullOrEmpty(htmlContent)) - htmlContent = "

Error: Method returned empty string

"; - - SendHtmlResponse(context, htmlContent); - } - else - { - Debug.LogError("HTML generation TIMEOUT (5 seconds)!"); - SendHtmlResponse(context, "

Error: Settings generation timeout

", 500); - } - } - catch (Exception ex) - { - Debug.LogError($"Error in settings html: {ex.Message}"); - SendHtmlResponse(context, $"

Error: {ex.Message}

", 500); - } - }); - } - - async Task HandleCssRequestAsync(HttpListenerContext context) - { - context.Response.ContentType = "text/css; charset=utf-8"; - context.Response.ContentLength64 = css.Length; - await context.Response.OutputStream.WriteAsync(css, 0, css.Length); - context.Response.OutputStream.Close(); - } - - private static void LoadCss() - { - TextAsset cssAsset = Resources.Load("style"); - - if (cssAsset != null) - { - css = Encoding.UTF8.GetBytes(cssAsset.text); - Debug.Log("CSS OK"); - } - else - { - Debug.LogWarning("CSS NOT OK"); - css = Array.Empty(); - } - } - - // ========================= - // AUTH - // ========================= - - async Task HandlePostLoginAsync(HttpListenerContext context) - { - try - { - string body = await ReadBodyAsStringAsync(context.Request); - // принимаем и form-url-encoded, и json - string pass = AuthManager.ExtractPassword(body, context.Request.ContentType); - - if (string.IsNullOrEmpty(pass)) - { - SendJson(context, 400, "{\"ok\":false,\"message\":\"Пароль пустой\"}"); - return; - } - - if (!AuthManager.VerifyPassword(pass, AdminPassword)) - { - SendJson(context, 401, "{\"ok\":false,\"message\":\"Неверный пароль\"}"); - return; - } - - string token = AuthManager.GenerateToken(AdminPassword, daysValid: 30); - AuthManager.SetAuthCookie(context.Response, token, daysValid: 30); - - SendJson(context, 200, "{\"ok\":true}"); - } - catch (Exception ex) - { - Debug.LogError($"Login error: {ex.Message}"); - SendJson(context, 500, "{\"ok\":false,\"message\":\"Server error\"}"); - } - } - - // ========================= - // REALTIME SETTINGS - // ========================= - - [Serializable] - private class SettingUpdateDto - { - public string id; - public string value; - } - - async Task HandlePostSingleSettingAsync(HttpListenerContext context) - { - try - { - string body = await ReadBodyAsStringAsync(context.Request); - - // Ждем JSON: {"id":"SETTING_ID","value":"on/off/123/1.5/SomeString"} - var dto = JsonUtility.FromJson(body); - if (dto == null || string.IsNullOrEmpty(dto.id)) - { - SendJson(context, 400, "{\"ok\":false,\"message\":\"Bad payload\"}"); - return; - } - - var (ok, log) = SettingsApplier.ApplySettings( - new Dictionary { { dto.id, dto.value ?? "" } }, - assumeMissingBoolOff: false // важно! иначе вырубишь все остальные bool - ); - - if (!ok) - { - SendJson(context, 400, "{\"ok\":false,\"message\":\"Apply failed\"}"); - return; - } - - // применяем на главном потоке - UnityMainThreadDispatcher.Instance.Enqueue(() => SettingsManager.OnSettingsChanged?.Invoke()); - UnityMainThreadDispatcher.Instance.Enqueue(() => GameManager.instance.AdminPanel - .GetComponent().RefreshViews()); - - SendJson(context, 200, "{\"ok\":true}"); - } - catch (Exception ex) - { - Debug.LogError($"POST /api/setting error: {ex.Message}\n{ex.StackTrace}"); - SendJson(context, 500, "{\"ok\":false,\"message\":\"Server error\"}"); - } - } - - // ========================= - // COINS HANDLER - // ========================= - - [Serializable] - private class CoinsDto - { - public int amount; - } - - async Task HandlePostCoinsAsync(HttpListenerContext context) - { - try - { - string body = await ReadBodyAsStringAsync(context.Request); - var dto = JsonUtility.FromJson(body); - - int amount = dto?.amount ?? 0; - if (amount <= 0) - { - SendJson(context, 400, "{\"ok\":false,\"message\":\"amount must be > 0\"}"); - return; - } - - // ЗАГОТОВКА: сюда ты впишешь реальную логику - UnityMainThreadDispatcher.Instance.Enqueue(() => OnAddCoins(amount)); - - SendJson(context, 200, "{\"ok\":true}"); - } - catch (Exception ex) - { - Debug.LogError($"POST /api/coins error: {ex.Message}\n{ex.StackTrace}"); - SendJson(context, 500, "{\"ok\":false,\"message\":\"Server error\"}"); - } - } - - async Task HandlePostActionAsync(HttpListenerContext context) - { - try - { - string body = await ReadBodyAsStringAsync(context.Request); - var dto = JsonUtility.FromJson(body); - - string name = dto?.name ?? ""; - if (string.IsNullOrWhiteSpace(name)) - { - SendJson(context, 400, "{\"ok\":false,\"message\":\"name is empty\"}"); - return; - } - - bool exists = settingActions != null && settingActions.Exists(a => a != null && a.Name == name); - if (!exists) - { - SendJson(context, 404, "{\"ok\":false,\"message\":\"action not found\"}"); - return; - } - - // Важно: UnityEvent только на главном потоке - UnityMainThreadDispatcher.Instance.Enqueue(() => ExecuteSettingAction(name)); - - SendJson(context, 200, "{\"ok\":true}"); - } - catch (Exception ex) - { - Debug.LogError($"POST /api/action error: {ex.Message}\n{ex.StackTrace}"); - SendJson(context, 500, "{\"ok\":false,\"message\":\"Server error\"}"); - } - } - - - private void OnAddCoins(int amount) => PaymentSystem.AddCreditNoCounters(amount); - - // ========================= - // LEGACY /upd (как было) - // ========================= - async Task HandlePostUpdateAsync(HttpListenerContext context) - { - try - { - Encoding encoding = Encoding.UTF8; - string contentType = context.Request.ContentType?.ToLower() ?? ""; - - if (contentType.Contains("charset=")) - { - try - { - string charset = contentType.Split("charset=")[1].Trim().Split(';')[0]; - encoding = Encoding.GetEncoding(charset); - } - catch - { - encoding = Encoding.UTF8; - } - } - - string requestBody; - using (var reader = new StreamReader(context.Request.InputStream, encoding)) - requestBody = await reader.ReadToEndAsync(); - - var formDict = new Dictionary(); - try - { - var formData = System.Web.HttpUtility.ParseQueryString(requestBody, encoding); - foreach (string key in formData.AllKeys) - { - if (key != null) - formDict[key] = formData[key] ?? ""; - } - } - catch (Exception parseEx) - { - Debug.LogWarning($"ParseQueryString ошибка: {parseEx.Message}"); - } - - SettingsApplier.ApplySettings(formDict, assumeMissingBoolOff: true); - - UnityMainThreadDispatcher.Instance.Enqueue(() => SettingsManager.OnSettingsChanged?.Invoke()); - UnityMainThreadDispatcher.Instance.Enqueue(() => GameManager.instance.AdminPanel.GetComponent().RefreshViews()); - - SendHtmlResponse(context, "

OK

Back"); - } - catch (Exception ex) - { - Debug.LogError($"Ошибка обработки POST /upd: {ex.Message}\n{ex.StackTrace}"); - SendHtmlResponse(context, $"

Ошибка: {ex.Message}

", 500); - } - } - - // ========================= - // Helpers - // ========================= - - private async Task ReadBodyAsStringAsync(HttpListenerRequest request) - { - Encoding encoding = Encoding.UTF8; - - // иногда Unity/браузер шлет json без charset — ок - if (!string.IsNullOrEmpty(request.ContentType)) - { - var ct = request.ContentType.ToLower(); - if (ct.Contains("charset=")) - { - try - { - string charset = ct.Split("charset=")[1].Trim().Split(';')[0]; - encoding = Encoding.GetEncoding(charset); - } - catch { encoding = Encoding.UTF8; } - } - } - - using var reader = new StreamReader(request.InputStream, encoding); - return await reader.ReadToEndAsync(); - } - - void SendHtmlResponse(HttpListenerContext context, string html, int statusCode = 200) - { - try - { - byte[] buffer = Encoding.UTF8.GetBytes(html); - context.Response.StatusCode = statusCode; - context.Response.ContentType = "text/html; charset=utf-8"; - context.Response.ContentLength64 = buffer.Length; - context.Response.OutputStream.Write(buffer, 0, buffer.Length); - context.Response.OutputStream.Close(); - } - catch (Exception ex) - { - Debug.LogError($"Error sending response: {ex.Message}"); - } - } - - private void SendJson(HttpListenerContext context, int statusCode, string json) - { - try - { - byte[] buffer = Encoding.UTF8.GetBytes(json); - context.Response.StatusCode = statusCode; - context.Response.ContentType = "application/json; charset=utf-8"; - context.Response.ContentLength64 = buffer.Length; - context.Response.OutputStream.Write(buffer, 0, buffer.Length); - context.Response.OutputStream.Close(); - } - catch (Exception ex) - { - Debug.LogError($"Error sending json: {ex.Message}"); - } - } - - private void Redirect(HttpListenerContext context, string location, int statusCode = 302) - { - context.Response.StatusCode = statusCode; - context.Response.Headers["Location"] = location; - context.Response.OutputStream.Close(); - } - - public void ExecuteSettingAction(string name) - { - SettingAction action = settingActions.Find(s => s.Name == name); - if (action != null) - { - action.OnPressed?.Invoke(); - } - else - { - Debug.Log($"Действие с именем {name} не найдено."); - } - } - - - void OnDestroy() - { - if (!isRunning) return; - isRunning = false; - listener?.Stop(); - listener?.Close(); - } - - private void OnApplicationQuit() - { - isRunning = false; - listener?.Stop(); - listener?.Close(); - } - - - [Serializable] - private class ActionDto - { - public string name; - } -} diff --git a/Assets/Scripts/Common/Server/WebServer.cs.meta b/Assets/Scripts/Common/Server/WebServer.cs.meta deleted file mode 100644 index 7048a49..0000000 --- a/Assets/Scripts/Common/Server/WebServer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 27edee241c0fb934ebe299af31cf6c77 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/SettingKey.cs b/Assets/Scripts/Common/SettingKey.cs new file mode 100644 index 0000000..6ea862c --- /dev/null +++ b/Assets/Scripts/Common/SettingKey.cs @@ -0,0 +1,32 @@ +public static class SettingKey +{ + public const string SHOW_NUMBERTECH = "ShowNumber"; + public const string DISPLAY_NOPRIZES = "DisplayNoPrizes"; + public const string DISPLAY_PRIZING_ERROR = "DisplayPrizingError"; + + public const string PRIZING = "Prizing"; + + public const string DIFFICULTY_MODE = "DifficultyMode"; + + public const string SOUNDS_VOLUME = "SoundsVolume"; + public const string PROMO_VOLUME = "PromoVolume"; + public const string MUSIC_VOLUME = "MusicVolume"; + + public const string DIFFICULTY = "Difficulty"; + + public const string BOARD_ROWS = "BoardRows"; + public const string BOARD_COLUMNS = "BoardColumns"; + + public const string TAKE_OR_RISK = "TakeOrRisk"; + + + public const string PRIZING_WHEN_ERROR = "PrizingWhenError"; + + public const string PASSWORD_ON_SETTINGS = "PasswordOnSettings"; + + //Цены + public const string FREEPLAY = "Freeplay"; + public const string PRICE_PVP = "PricePvp"; + public const string PRICE_PVE = "PricePve"; + public const string PRICE_REVENGE = "PriceRevenge"; +} \ No newline at end of file diff --git a/Assets/Scripts/Common/SettingKey.cs.meta b/Assets/Scripts/Common/SettingKey.cs.meta new file mode 100644 index 0000000..ae651b9 --- /dev/null +++ b/Assets/Scripts/Common/SettingKey.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6562b94d23034234297c51771091dc5f \ No newline at end of file diff --git a/Assets/Scripts/Common/SettingKeys.cs b/Assets/Scripts/Common/SettingKeys.cs deleted file mode 100644 index 083abc2..0000000 --- a/Assets/Scripts/Common/SettingKeys.cs +++ /dev/null @@ -1,9 +0,0 @@ -public static class SettingKeys -{ - public const string SHOW_NUMBERTECH = "ShowNumber"; - public const string DISPLAY_NOPRIZES = "DisplayNoPrizes"; - public const string DISPLAY_PRIZING_ERROR = "DisplayPrizingError"; - - public const string FREEPLAY = "Freeplay"; - public const string PRIZING = "Prizing"; -} diff --git a/Assets/Scripts/Common/SettingKeys.cs.meta b/Assets/Scripts/Common/SettingKeys.cs.meta deleted file mode 100644 index 1990c2a..0000000 --- a/Assets/Scripts/Common/SettingKeys.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: d2f9637e54972b340b50c7d1e940893f \ No newline at end of file diff --git a/Assets/Scripts/Common/SoundManager.cs b/Assets/Scripts/Common/SoundManager.cs index 63e4e55..6158428 100644 --- a/Assets/Scripts/Common/SoundManager.cs +++ b/Assets/Scripts/Common/SoundManager.cs @@ -72,7 +72,7 @@ public class SoundManager : MonoBehaviour PaymentSystem.OnNotEnoughMoney += playNoMoney; ApplySettings(); - SettingsManager.OnSettingsChanged.AddListener(ApplySettings); + SettingsManager.OnSettingsChanged += ApplySettings; } catch { } @@ -100,12 +100,12 @@ public class SoundManager : MonoBehaviour public void ApplySettings() { //print("Применяем настройки звука"); - musicVolume = SettingsManager.GetFloat("MusicVolume", 0.5f); - promoVolume = SettingsManager.GetFloat("PromoVolume", 0.5f); + musicVolume = SettingsManager.GetFloat(SettingKey.MUSIC_VOLUME); + promoVolume = SettingsManager.GetFloat(SettingKey.PROMO_VOLUME); music.volume = musicVolume; - effectsVolume = SettingsManager.GetFloat("SoundsVolume", 0.5f); + effectsVolume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); // Массив для оптимизации установки громкости AudioSource[] audioSources = { chipLandSound, chipDownSound, wrongSound, winEffect, @@ -228,7 +228,7 @@ public class SoundManager : MonoBehaviour } //восстанавливаю громкость - float musicVolume = SettingsManager.GetFloat("MusicVolume", 0.5f); + float musicVolume = SettingsManager.GetFloat(SettingKey.MUSIC_VOLUME); music.volume = musicVolume; musicCoroutine = StartCoroutine(MusicFadeCoroutine(fadeDuration, holdDuration, targetVolumePercent)); diff --git a/Assets/Scripts/ControlsPerformer.cs b/Assets/Scripts/ControlsPerformer.cs new file mode 100644 index 0000000..1296732 --- /dev/null +++ b/Assets/Scripts/ControlsPerformer.cs @@ -0,0 +1,20 @@ +using UnityEngine; + +public class ControlsPerformer : MonoBehaviour +{ + public static ControlsPerformer Instance { get; private set; } + + private IControlable _controlable; + + public void Initialize() + => Instance = this; + + public void SetControlable(IControlable controlable) + => _controlable = controlable; + + private void Update() + { + if (_controlable != null && _controlable.ControlsEnabled) + _controlable.UpdateControls(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/ControlsPerformer.cs.meta b/Assets/Scripts/ControlsPerformer.cs.meta new file mode 100644 index 0000000..b6ebaff --- /dev/null +++ b/Assets/Scripts/ControlsPerformer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9b4855ad6643fd248881a941bc6c4837 \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Board.cs b/Assets/Scripts/Gameplay/Board.cs index 5d4881c..e020134 100644 --- a/Assets/Scripts/Gameplay/Board.cs +++ b/Assets/Scripts/Gameplay/Board.cs @@ -25,7 +25,7 @@ public class Board : MonoBehaviour Instance = this; ApplySettings(); - SettingsManager.OnSettingsChanged.AddListener(ApplySettings); + SettingsManager.OnSettingsChanged += ApplySettings; } public Vector2 GetStickedPosition(int column) => new Vector2(GetXPosition(column), config.stickedY); @@ -110,8 +110,8 @@ public class Board : MonoBehaviour //todo: реализовать private void ApplySettings() { - int columns = SettingsManager.GetInt("", 6); - int rows = SettingsManager.GetInt("", 5); + int columns = SettingsManager.GetInt(SettingKey.BOARD_COLUMNS); + int rows = SettingsManager.GetInt(SettingKey.BOARD_ROWS); RebuildBoard(columns, rows); } diff --git a/Assets/Scripts/Gameplay/Bot Characters/Character.cs b/Assets/Scripts/Gameplay/Bot Characters/Character.cs index abb6ca2..f932daf 100644 --- a/Assets/Scripts/Gameplay/Bot Characters/Character.cs +++ b/Assets/Scripts/Gameplay/Bot Characters/Character.cs @@ -91,20 +91,18 @@ public class Character : MonoBehaviour private GameObject currentMessageBox; - bool useVoice = true; #endregion РЕПЛИКИ private string pulledGlobalDifficulty; void pullSettings() { - useVoice = SettingsManager.GetBool("EnableVoices", true); - pulledGlobalDifficulty = SettingsManager.GetString("Difficulty", "Средняя"); + pulledGlobalDifficulty = SettingsManager.GetString(SettingKey.DIFFICULTY); currentDifficulty = CurrenDifficultyList.Count / 2; - audioSource.volume = SettingsManager.GetFloat("SoundsVolume", 0.5f); + audioSource.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); } private void OnEnable() { - SettingsManager.OnSettingsChanged.AddListener(pullSettings); + SettingsManager.OnSettingsChanged += pullSettings; audioSource = GetComponent(); pullSettings(); @@ -212,7 +210,7 @@ public class Character : MonoBehaviour int index = UnityEngine.Random.Range(0, replicasTemp.Count); string message = replicasTemp[index].text; - if (replicasTemp[index].clip && useVoice) + if (replicasTemp[index].clip) { audioSource.clip = replicasTemp[index].clip; audioSource.Play(); @@ -243,7 +241,7 @@ public class Character : MonoBehaviour string message = replica.text; - if (replica.clip && useVoice) + if (replica.clip) { audioSource.clip = replica.clip; audioSource.Play(); @@ -271,7 +269,7 @@ public class Character : MonoBehaviour sound = new GameObject("TypingSound"); source = sound.AddComponent(); //source.clip = botVoice; - source.volume = SettingsManager.GetFloat("SoundsVolume", 0.5f) * 0.5f; + source.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME) * 0.5f; typingDelay = replicaClipLength / message.Length; } @@ -344,7 +342,7 @@ public class Character : MonoBehaviour private DifficultyPreset GetDifficultyPreset() { List presets; - if (SettingsManager.GetString("BaseBotDifficulty", "Фиксированная") == "Повышенная") + if (SettingsManager.GetString(SettingKey.DIFFICULTY_MODE) == "Заработок") presets = difficultyPresetsHard; else presets = CurrenDifficultyList; diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs b/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs deleted file mode 100644 index de2fe2f..0000000 --- a/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs +++ /dev/null @@ -1,331 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.Text; -using UnityEngine; -using PrizeSystem; -public class CharacterController : MonoBehaviour -{ - - [SerializeField] private Transform charactersContainer; - [SerializeField] private Transform charactersPool; - - [SerializeField] private List characterPrefabs; - public Character[] characters; - - [SerializeField] private Vector2 hiddenLocalPosition; - [SerializeField] private Vector2 shownLocalPosition; - - private bool charactersActivated = false; - private int currentIndex = 0; - - [SerializeField] private float speed; - public static CharacterController I; - - public static int CharactersAmount => I.characters.Length; - public static Sprite CurrentChipImage => CurrentCharacter.chipImage; - public static Character CurrentCharacter => I.characters[I.currentIndex]; - public static Character NextCharacter - { - get - { - if (I.currentIndex + 1 < I.characters.Length) - { - return I.characters[I.currentIndex + 1]; - } - else return null; - } - - } - - - - - - //================================= start: PUBLIC API =================================// - - public void SetAllCharactersPrizeAvailable(bool value) - { - foreach (Character character in I.characters) - { - character.HasPrize = value; - } - } - - public static void ResetCharactersDifficulty() - { - foreach (Character ch in I.characters) - { - ch.currentDifficulty = ch.CurrenDifficultyList.Count / 2; //берем средню сложность изначально - } - } - - //Задвинуть контейнер за экран - public static void HideCharacter() - { - CurrentCharacter?.UnbindEvents(); - I.StopAllCoroutines(); - I.StartCoroutine(I.MoveLocal(I.charactersContainer, I.hiddenLocalPosition, I.speed)); - } - - //задвинуть одного, показать другого - public static void SwitchToCharacter(int index) - { - I.StopAllCoroutines(); - I.StartCoroutine(I.TransitionToCharacter(index)); - } - - public static void ResetState() - { - I.StopAllCoroutines(); - I.charactersContainer.transform.localPosition = I.hiddenLocalPosition; - I.ClearContainer(); - I.charactersActivated = false; - I.currentIndex = 0; - } - - //Вывести контейнер на экран - public static void ShowCharacter() - { - I.StopAllCoroutines(); - I.StartCoroutine(I.MoveLocal(I.charactersContainer, I.shownLocalPosition, I.speed)); - } - //================================= end : PUBLIC API =================================// - - public void Initialize() - { - I = this; - SetupCharacters(); - } - - private void SetupCharacters() - { - //обрабатвыаем некорректные вводные - if (GameManager.instance.botsAmount <= 0) - throw new System.Exception("Некорректное количество ботов в менеджере"); - if (characterPrefabs.Count <= 0) - throw new System.Exception("Не заданы боты в контроллере"); - - - int botsToSpawn = Mathf.Min(GameManager.instance.botsAmount, characterPrefabs.Count); - GameManager.instance.botsAmount = botsToSpawn; - - //characters = new Character[GameManager.instance.botsAmount]; - characters = new Character[botsToSpawn]; - for (int i = 0; i < characters.Length; i++) - { - var go = Instantiate(characterPrefabs[i], charactersPool); - go.transform.localPosition = hiddenLocalPosition; - - var ch = go.GetComponent(); - ch.Animator.SetTrigger("PreAppear"); - characters[i] = ch; - } - - ClearContainer(); - RefreshPrizes(); - } - - public void RefreshPrizes() - { - List prizes = PrizeSerializer.LoadPrizes(); - - for (int i = 0; i < characters.Length; i++) - { - characters[i].prize = prizes[i]; - } - } - - private void ClearContainer() - { - for (int i = charactersContainer.childCount - 1; i >= 0; i--) - { - var child = charactersContainer.transform.GetChild(i); - child.SetParent(charactersPool); - } - } - //Замена префаба - private void SetCharacter(int index) - { - ClearContainer(); - - if (index < 0 || index >= CharactersAmount) index = 0; - - var newCharacter = characters[index]; - - //сажаем нового в контейнер - newCharacter.transform.SetParent(charactersContainer); - newCharacter.transform.localPosition = newCharacter.CharacterLocalPosition; - - newCharacter.Animator.SetTrigger("PreAppear"); - //animator.ResetTrigger("Throw"); - - newCharacter.BindEvents(); - } - - - //Перемещение объекта по локальным координатам - private IEnumerator MoveLocal(Transform t, Vector3 targetLocalPos, float speed) - { - while (t.localPosition != targetLocalPos) - { - t.localPosition = Vector3.MoveTowards(t.localPosition, targetLocalPos, speed * Time.deltaTime); - yield return null; - } - } - - //Анимация смены персонажей - private IEnumerator TransitionToCharacter(int newIndex) - { - int oldIndex = currentIndex; - currentIndex = newIndex; - LightUtility.Character(characters[newIndex]); - - //Отсекаем попытку переключиться на того же персонажа - if (newIndex == oldIndex && charactersActivated) yield break; // тостер отсекается. надо решать - charactersActivated = true; //чтобы тостер тоже приходил иначе старт 0, запрашиваем 0 персонажа -> тостер отсекся - - //сразу отвязываем реплики старого персонажа - characters[oldIndex]?.UnbindEvents(); - - Transform container = charactersContainer; - - //Уводим контейнер за экран - yield return MoveLocal(charactersContainer, hiddenLocalPosition, speed); - characters[oldIndex].Animator.SetTrigger("PreAppear"); - - //Сажаем нового персонажа - SetCharacter(newIndex); - yield return new WaitForSeconds(0.1f); - - //Выводим на экран - yield return MoveLocal(charactersContainer, shownLocalPosition, speed); - - //дергаем появление - CharacterEventBus.Instance.OnCharacterAppeared?.Invoke(); - - //понижение уровня - if (newIndex < oldIndex) - CharacterEventBus.Instance.OnLevelDown?.Invoke(); - } - - - void printPresetsInfo() - { - StringBuilder sb = new StringBuilder(); - - foreach (Character character in characters) - { - sb.Append(character.name + "\n"); - List> lists = new List>(); - lists.Add(character.difficultyPresetsEasy); - lists.Add(character.difficultyPresetsMedium); - lists.Add(character.difficultyPresetsHard); - for (int i = 0; i < 3; i++) - { - List list = lists[i]; - if (i == 0) sb.Append("Легкий\n"); - if (i == 1) sb.Append("Средний\n"); - if (i == 2) sb.Append("Сложный\n"); - int presetindex = 0; - foreach (DifficultyPreset preset in list) - { - sb.Append(presetindex.ToString() + "\n"); - - sb.Append("Описание: " + preset.Description + "\n"); - sb.Append("Глубина поиска: " + preset.Depth + "\n"); - sb.Append("Бонус победы: " + preset.WinBonus + "\n"); - sb.Append("Бонус 2 в ряд: " + preset.RowOfTwoBonus + "\n"); - sb.Append("Бонус 3 в ряд: " + preset.RowOfThree + "\n"); - sb.Append("Бонус центр: " + preset.CenterBonus + "\n"); - sb.Append("Бонус блок: " + preset.BlockBonus + "\n"); - sb.Append("Случайный ход: " + preset.RandomMoveRate + "\n"); - sb.Append("Ошибочный ход: " + preset.MistakeRate + "\n"); - sb.Append("Температура: " + preset.Temperature + "\n"); - sb.Append("Сигма-шум: " + preset.ScoreNoiseSigma + "\n"); - sb.Append("Количество вариантов для выбора по софтмаксу: " + preset.TopK + "\n"); - - sb.Append("\n\n"); - presetindex++; - } - } - Debug.Log(sb.ToString()); - sb.Clear(); - } - - } - - public static void ExportCharactersReplicas() - { - StringBuilder sb = new StringBuilder(); - - foreach (Character character in I.characters) - { - // Заголовок с именем персонажа - sb.AppendLine($"=={character.name}=="); - - // Появление - sb.AppendLine("Появление"); - for (int i = 0; i < character.appearReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.appearReplicas[i].text}"); - } - sb.AppendLine(); - - // Ход игрока - sb.AppendLine("Ход игрока"); - for (int i = 0; i < character.playerTurnReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.playerTurnReplicas[i].text}"); - } - sb.AppendLine(); - - // Ход бота - sb.AppendLine("Ход бота"); - for (int i = 0; i < character.botTurnReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.botTurnReplicas[i].text}"); - } - sb.AppendLine(); - - // Игрок выиграл - sb.AppendLine("Игрок выиграл"); - for (int i = 0; i < character.playerWinReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.playerWinReplicas[i].text}"); - } - sb.AppendLine(); - - // Бот выиграл - sb.AppendLine("Бот выиграл"); - for (int i = 0; i < character.botWinReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.botWinReplicas[i].text}"); - } - sb.AppendLine(); - - // Вернулись на предыдущий уровень - sb.AppendLine("Вернулись на предыдущий уровень"); - for (int i = 0; i < character.returnReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.returnReplicas[i].text}"); - } - sb.AppendLine(); - - // Ничья - sb.AppendLine("Ничья"); - for (int i = 0; i < character.drawReplicas.Count; i++) - { - sb.AppendLine($"{i + 1}. {character.drawReplicas[i].text}"); - } - - sb.AppendLine(); - sb.AppendLine(); - } - - // Сохранение в файл - string filePath = Application.dataPath + "/CharactersReplicas.txt"; - System.IO.File.WriteAllText(filePath, sb.ToString()); - Debug.Log($"Реплики персонажей экспортированы в: {filePath}"); - } - -} diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs.meta b/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs.meta deleted file mode 100644 index 7f592d7..0000000 --- a/Assets/Scripts/Gameplay/Bot Characters/CharacterController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 258d0b28fdc0a254c94a52b560e44624 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: -90 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs b/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs new file mode 100644 index 0000000..e9bf30d --- /dev/null +++ b/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs @@ -0,0 +1,176 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using PrizeSystem; +using System; + +public class CharactersController : MonoBehaviour +{ + public static CharactersController I; + + [SerializeField] private Transform charactersContainer; + [SerializeField] private Transform charactersPool; + [SerializeField] private List characterPrefabs; + [SerializeField] private Vector2 hiddenLocalPosition; + [SerializeField] private Vector2 shownLocalPosition; + [SerializeField] private float speed; + + private Character[] characters; + private bool charactersActivated = false; + private int currentIndex = 0; + + public static int CharactersAmount => I.characters.Length; + public static Character CurrentCharacter => I.characters[I.currentIndex]; + public static Character NextCharacter + { + get + { + if (I.currentIndex + 1 < I.characters.Length) + { + return I.characters[I.currentIndex + 1]; + } + else return null; + } + } + + public void Initialize() + { + I = this; + SetupCharacters(); + } + + public void SetAllCharactersPrizeAvailable(bool value) + { + foreach (Character character in I.characters) + character.HasPrize = value; + } + + public static void ResetAllCharactersDifficulty() + { + foreach (Character ch in I.characters) + ch.currentDifficulty = ch.CurrenDifficultyList.Count / 2; //берем средню сложность изначально + } + + public static void HideCharacter() + { + CurrentCharacter?.UnbindEvents(); + I.StopAllCoroutines(); + I.StartCoroutine(I.MoveLocal(I.charactersContainer, I.hiddenLocalPosition, I.speed)); + } + + public static void SwitchToCharacter(int index) + { + I.StopAllCoroutines(); + I.StartCoroutine(I.TransitionToCharacter(index)); + } + + public static void ResetState() + { + I.StopAllCoroutines(); + I.charactersContainer.transform.localPosition = I.hiddenLocalPosition; + I.ClearContainer(); + I.charactersActivated = false; + I.currentIndex = 0; + } + + public static Character[] GetCharactersArray() => new List(I.characters).ToArray(); + + private void SetupCharacters() + { + if (characterPrefabs.Count <= 0) + throw new System.Exception("Не заданы боты в контроллере"); + + int amount = characterPrefabs.Count; + characters = new Character[amount]; + + for (int i = 0; i < amount; i++) + { + var character = Instantiate(characterPrefabs[i], charactersPool); + characters[i] = character; + + character.transform.localPosition = hiddenLocalPosition; + character.Animator.SetTrigger("PreAppear"); + } + + ClearContainer(); + RefreshPrizes(); + } + + public void RefreshPrizes() + { + List prizes = PrizeSerializer.LoadPrizes(); + + for (int i = 0; i < characters.Length; i++) + characters[i].prize = prizes[i]; + } + + private void ClearContainer() + { + for (int i = charactersContainer.childCount - 1; i >= 0; i--) + { + var child = charactersContainer.transform.GetChild(i); + child.SetParent(charactersPool); + } + } + + private void SetCharacter(int index) + { + ClearContainer(); + + if (index < 0 || index >= CharactersAmount) index = 0; + + var newCharacter = characters[index]; + + //сажаем нового в контейнер + newCharacter.transform.SetParent(charactersContainer); + newCharacter.transform.localPosition = newCharacter.CharacterLocalPosition; + + newCharacter.Animator.SetTrigger("PreAppear"); + //animator.ResetTrigger("Throw"); + + newCharacter.BindEvents(); + } + + private IEnumerator MoveLocal(Transform t, Vector3 targetLocalPos, float speed) + { + while (t.localPosition != targetLocalPos) + { + t.localPosition = Vector3.MoveTowards(t.localPosition, targetLocalPos, speed * Time.deltaTime); + yield return null; + } + } + + private IEnumerator TransitionToCharacter(int newIndex) + { + int oldIndex = currentIndex; + currentIndex = newIndex; + LightUtility.Character(characters[newIndex]); + + //Отсекаем попытку переключиться на того же персонажа + if (newIndex == oldIndex && charactersActivated) yield break; // тостер отсекается. надо решать + charactersActivated = true; //чтобы тостер тоже приходил иначе старт 0, запрашиваем 0 персонажа -> тостер отсекся + + //сразу отвязываем реплики старого персонажа + characters[oldIndex]?.UnbindEvents(); + + Transform container = charactersContainer; + + //Уводим контейнер за экран + yield return MoveLocal(charactersContainer, hiddenLocalPosition, speed); + characters[oldIndex].Animator.SetTrigger("PreAppear"); + + //Сажаем нового персонажа + SetCharacter(newIndex); + yield return new WaitForSeconds(0.1f); + + //Выводим на экран + yield return MoveLocal(charactersContainer, shownLocalPosition, speed); + + //дергаем появление + CharacterEventBus.Instance.OnCharacterAppeared?.Invoke(); + + //понижение уровня + if (newIndex < oldIndex) + CharacterEventBus.Instance.OnLevelDown?.Invoke(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs.meta b/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs.meta new file mode 100644 index 0000000..346c68f --- /dev/null +++ b/Assets/Scripts/Gameplay/Bot Characters/CharactersController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f79f1e2c50eb4b14583157ed5996c65f \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/CoinSound.cs b/Assets/Scripts/Gameplay/CoinSound.cs index 0f93b4a..6f17382 100644 --- a/Assets/Scripts/Gameplay/CoinSound.cs +++ b/Assets/Scripts/Gameplay/CoinSound.cs @@ -7,7 +7,7 @@ public class CoinSound : MonoBehaviour private void OnEnable() { AudioSource source = GetComponent(); - source.volume = SettingsManager.GetFloat("SoundsVolume", 0.5f); + source.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); source.Play(); } } diff --git a/Assets/Scripts/Gameplay/DifficultyManager.cs b/Assets/Scripts/Gameplay/DifficultyManager.cs index ec47caa..b7d5368 100644 --- a/Assets/Scripts/Gameplay/DifficultyManager.cs +++ b/Assets/Scripts/Gameplay/DifficultyManager.cs @@ -28,22 +28,22 @@ public class DifficultyManager : MonoBehaviour public UnityEvent OnVictory = new UnityEvent(); public int currentOpponent = 0; - public DifficultyPreset DifficultyPreset => CharacterController.CurrentCharacter.CurrentDifficultyPreset; + public DifficultyPreset DifficultyPreset => CharactersController.CurrentCharacter.CurrentDifficultyPreset; public DifficultyPreset DummyPreset; public bool dummyBots = false; public void IncreaseDifficulty() { - if (currentOpponent + 1 == CharacterController.CharactersAmount)//победили самую большую сложность + if (currentOpponent + 1 == CharactersController.CharactersAmount)//победили самую большую сложность { OnVictory?.Invoke(); } - CharacterController.CurrentCharacter.IncreaseDifficuly();//увеличиваем сложность у того с кем бились - currentOpponent = (currentOpponent + 1) % CharacterController.CharactersAmount;//если победили последнего, то возвращаемся на первого + CharactersController.CurrentCharacter.IncreaseDifficuly();//увеличиваем сложность у того с кем бились + currentOpponent = (currentOpponent + 1) % CharactersController.CharactersAmount;//если победили последнего, то возвращаемся на первого } public void DecreaseDifficulty() { - CharacterController.CurrentCharacter.DecreaseDifficuly();//уменьшаем сложность у того с кем бились + CharactersController.CurrentCharacter.DecreaseDifficuly();//уменьшаем сложность у того с кем бились if (currentOpponent != 0) { currentOpponent--; @@ -52,21 +52,22 @@ public class DifficultyManager : MonoBehaviour public void ResetDifficulty() { currentOpponent = 0; - CharacterController.ResetCharactersDifficulty(); + CharactersController.ResetAllCharactersDifficulty(); } public void upgradeFeeshkaDifficulty() { - string difficultyType = SettingsManager.GetString("BaseBotDifficulty", "Обычная"); - if (difficultyType == "Обычная") - { - PaymentSystem.ResetPulsesCounter(); - Setting difficultySetting = SettingsManager.Container.TryGetSetting("BaseBotDifficulty"); - difficultySetting.StringValue = "Повышенная"; - SettingsManager.OnSettingsChanged?.Invoke(); - SettingsManager.SaveContainerToFile(); - GameManager.instance.AdminPanel.GetComponent().RefreshViews(); - print("Сложность повышена"); - } + string difficultyMode = SettingsManager.GetString(SettingKey.DIFFICULTY_MODE); + //todo: разобраться + // if (difficultyMode == "Прохождение") + // { + // PaymentSystem.ResetPulsesCounter(); + // Setting difficultySetting = SettingsManager.Container.TryGetSetting(SettingKeys.DIFFICULTY_MODE); + // difficultySetting.StringValue = "Заработок"; + // SettingsManager.OnSettingsChanged?.Invoke(); + // SettingsManager.SaveContainerToFile(); + // GameManager.instance.AdminPanel.GetComponent().RefreshViews(); + // print("Сложность повышена"); + // } } } diff --git a/Assets/Scripts/Gameplay/EndOfTurnHandler.cs b/Assets/Scripts/Gameplay/EndOfTurnHandler.cs index b7a7c42..a4e4cb0 100644 --- a/Assets/Scripts/Gameplay/EndOfTurnHandler.cs +++ b/Assets/Scripts/Gameplay/EndOfTurnHandler.cs @@ -6,12 +6,12 @@ public static class EndOfTurnHandler private static bool TotalWin() => gm.player1score == 5 || gm.player2score == 5 || gm.vsBotScore == gm.botsAmount; - private static void ClearAllScales() - { - if (gm.botScale.isActiveAndEnabled) gm.botScale.ClearScale(); - if (gm.Player1Scale.isActiveAndEnabled) gm.Player1Scale.ClearScale(); - if (gm.Player2Scale.isActiveAndEnabled) gm.Player2Scale.ClearScale(); - } + //private static void ClearAllScales() + //{ + // if (gm.botScale.isActiveAndEnabled) gm.botScale.ClearScale(); + // if (gm.Player1Scale.isActiveAndEnabled) gm.Player1Scale.ClearScale(); + // if (gm.Player2Scale.isActiveAndEnabled) gm.Player2Scale.ClearScale(); + //} //Надо куда то это перемещать. Мб в тот же роутер. public static void WinByTimerHandling() @@ -30,26 +30,26 @@ public static class EndOfTurnHandler if (gm.currentPlayer == CellState.Player2) { gm.player1score += 1; - gm.Player1Scale.SetMedalsCount(gm.player1score); + //gm.Player1Scale.SetMedalsCount(gm.player1score); } else//p1 не успел { gm.player2score += 1; - gm.Player2Scale.SetMedalsCount(gm.player2score); + //gm.Player2Scale.SetMedalsCount(gm.player2score); } } else if (gm.gameMode == GameMode.pve)//время вышло при игре с ботом - бот победил { LightUtility.Lose(); - CharacterController.CurrentCharacter.GetComponent().SetTrigger("Win"); + CharactersController.CurrentCharacter.GetComponent().SetTrigger("Win"); //НЕ НИЧЬЯ - VictoryScale vsBotScale = gm.botScale; + //VictoryScale vsBotScale = gm.botScale; DifficultyManager.Instance.DecreaseDifficulty(); CharacterEventBus.Instance.OnBotWin?.Invoke(); if (gm.vsBotScore != 0) gm.vsBotScore -= 1; - vsBotScale.SetMedalsCount(gm.vsBotScore); + //vsBotScale.SetMedalsCount(gm.vsBotScore); } nextState = new ShowWinnerState(); @@ -58,7 +58,7 @@ public static class EndOfTurnHandler if (TotalWin()) { nextState = new VictoryState(); - ClearAllScales(); + //ClearAllScales(); } gm.stateMachine.ChangeState(nextState); diff --git a/Assets/Scripts/Gameplay/PVP Characters/Avatar.cs b/Assets/Scripts/Gameplay/PVP Characters/Avatar.cs index daad355..86b2758 100644 --- a/Assets/Scripts/Gameplay/PVP Characters/Avatar.cs +++ b/Assets/Scripts/Gameplay/PVP Characters/Avatar.cs @@ -22,7 +22,6 @@ public class Avatar : MonoBehaviour private Animator animator; private GameObject currentMessageBox; - private bool useVoice = true; private bool nowTyping = false; private CellState team; @@ -84,7 +83,7 @@ public class Avatar : MonoBehaviour public void Initialize(CellState team) { this.team = team; - SettingsManager.OnSettingsChanged.AddListener(pullSettings); + SettingsManager.OnSettingsChanged += pullSettings; audioSource = GetComponent(); pullSettings(); } @@ -95,8 +94,7 @@ public class Avatar : MonoBehaviour private void pullSettings() { - useVoice = SettingsManager.GetBool("EnableVoices", true); - audioSource.volume = SettingsManager.GetFloat("SoundsVolume", 0.5f); + audioSource.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); } private bool Message(ref List replicasTemp, List replicas, bool priority, float chance) @@ -129,7 +127,7 @@ public class Avatar : MonoBehaviour Replica replica = replicasTemp[replicaIndex]; replicasTemp.RemoveAt(replicaIndex); - if (replica.clip && useVoice) + if (replica.clip) { audioSource.clip = replica.clip; audioSource.Play(); diff --git a/Assets/Scripts/Gameplay/VictoryScale.cs b/Assets/Scripts/Gameplay/VictoryScale.cs deleted file mode 100644 index afeda8e..0000000 --- a/Assets/Scripts/Gameplay/VictoryScale.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class VictoryScale : MonoBehaviour -{ - public ParticleSystem winParticles; // надо заприватить и почистить вызовы - - [SerializeField] List medals; - [SerializeField] List rings; - [SerializeField] Transform Prize; - [SerializeField] Vector3 nextMedalOffset; - [SerializeField] GameObject CollectEffect, RemoveEffect; - - [SerializeField] Animator CommonAnimator; - [SerializeField] Animator PrizeAnimator; - - [SerializeField] AudioClip plusMedal; - [SerializeField] AudioClip minusMedal; - - private int count = 0; - - private void OnEnable() - { - winParticles.Stop(); - foreach (var medal in medals) - { - medal.gameObject.SetActive(false); - } - } - - public void SetIdleState() - { - CommonAnimator?.SetTrigger("Idle"); - PrizeAnimator?.SetTrigger("Idle"); - } - - public void SetWinState() - { - CommonAnimator?.SetTrigger("Prize"); - PrizeAnimator?.SetTrigger("Prize"); - } - - public void SetSlotsCount(int count) - { - foreach (var ring in rings) - { - ring.gameObject.SetActive(false); - } - for (int i = 0; i < count; i++) - { - rings[i].gameObject.SetActive(true); - } - Prize.position = rings[count - 1].position + nextMedalOffset; - } - - public void SetMedalsCount(int requiredCount) - { - if (count == requiredCount || - requiredCount > medals.Count || - requiredCount < 0) - return; - - if (requiredCount > count)//увеличиваем заполнение - { - for (int i = count; i < requiredCount; i++) - { - EnableMedal(i); - } - } - else if (requiredCount < count) - { - for (int i = count; i > requiredCount; i--) - { - DisableMedal(i-1); - } - } - count = requiredCount; - } - - private void EnableMedal(int index) - { - GameObject effect = CollectEffect; - SoundManager.instance.playClip(plusMedal); - Instantiate(effect, medals[index].position, Quaternion.identity); - medals[index].gameObject.SetActive(true); - } - - public void DisableMedal(int index) - { - GameObject effect = RemoveEffect; - SoundManager.instance.playClip(minusMedal); - Instantiate(effect, medals[index].position, Quaternion.identity); - medals[index].gameObject.SetActive(false); - } - - public void ResetScale() - { - count = 0; - foreach (var medal in medals) - { - medal.gameObject.SetActive(false); - } - } - - public void ClearScale() - { - StartCoroutine(ClearScaleAnimation()); - } - - IEnumerator ClearScaleAnimation() - { - for (int i = 4; i >= 0; i--) - { - medals[i].gameObject.SetActive(false); - yield return new WaitForSeconds(0.5f); - } - ResetScale(); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/VictoryScale.cs.meta b/Assets/Scripts/Gameplay/VictoryScale.cs.meta deleted file mode 100644 index 3dff2d4..0000000 --- a/Assets/Scripts/Gameplay/VictoryScale.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8743e4d9f3eee864f8a12d196097acac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/WinPanel.cs b/Assets/Scripts/Gameplay/WinPanel.cs index 17dd873..45508af 100644 --- a/Assets/Scripts/Gameplay/WinPanel.cs +++ b/Assets/Scripts/Gameplay/WinPanel.cs @@ -21,7 +21,7 @@ public class WinPanel : MonoBehaviour winBot.SetActive(true); break; } - sound.volume = SettingsManager.GetFloat("SoundsVolume", 0); + sound.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); sound.Play(); StartCoroutine(OpenPanel()); diff --git a/Assets/Scripts/IControlable.cs b/Assets/Scripts/IControlable.cs new file mode 100644 index 0000000..fd5ac14 --- /dev/null +++ b/Assets/Scripts/IControlable.cs @@ -0,0 +1,5 @@ +public interface IControlable +{ + bool ControlsEnabled { get; set; } + void UpdateControls(); +} diff --git a/Assets/Scripts/IControlable.cs.meta b/Assets/Scripts/IControlable.cs.meta new file mode 100644 index 0000000..ab505b5 --- /dev/null +++ b/Assets/Scripts/IControlable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 459ac47e477414b429c3aefd82c0a754 \ No newline at end of file diff --git a/Assets/Scripts/Menu/MenuController.cs b/Assets/Scripts/Menu/MenuController.cs deleted file mode 100644 index ef78488..0000000 --- a/Assets/Scripts/Menu/MenuController.cs +++ /dev/null @@ -1,78 +0,0 @@ -using TMPro; -using UnityEngine; - -public class MenuController : MonoBehaviour -{ - [Header("Ошибка выдачи приза")] - [SerializeField] CanvasGroup smallPrizeErrorCG; - - [Header("Техподдержка")] - [SerializeField] TextMeshProUGUI numberTechLabel; - [SerializeField] CanvasGroup numberTechCG; - [SerializeField] string numberTechPrefix = "тех.поддержка: "; - - [Header("Серийник")] - [SerializeField] TextMeshProUGUI serialLabel; - [SerializeField] string serialDefault = "серийный номер не указан"; - - [Header("Маленькие призы закончились")] - [SerializeField] CanvasGroup smallPrizesOutCG; - - [Header("Цены")] - [SerializeField] TextMeshProUGUI pricePveLabel; - [SerializeField] TextMeshProUGUI pricePvpLabel; - [SerializeField] CanvasGroup pricePveCG; - [SerializeField] CanvasGroup pricePvpCG; - [SerializeField] string pricePrefix = "Цена: "; - - [Header("Супер приз")] - [SerializeField] SpecialPrizeView specialPrizeView; - - public void Init() - { - specialPrizeView.Init(); - } - - private void UpdateNumberTech() - { - //номер техподдержки - bool showNum = SettingsManager.GetBool(SettingKeys.SHOW_NUMBERTECH, true); - string contact = PlayerPrefs.GetString(PrefsKeyVault.NUMBER_TECH, "<не указано>"); - numberTechLabel.text = showNum ? $"{numberTechPrefix}{contact}" : ""; - numberTechCG.alpha = showNum ? 1 : 0; - } - - private void UpdateNoPrizesLabel() - { - //"маленькие призы закончились" - bool displayBySetting = SettingsManager.GetBool(SettingKeys.DISPLAY_NOPRIZES, false); - bool noPrizesOnCounter = PlayerPrefs.GetInt(PrefsKeyVault.PRIZES_AVAILABLE, 0) <= 0; - smallPrizesOutCG.alpha = displayBySetting && noPrizesOnCounter ? 1 : 0; - } - - private void UpdatePrizeErrorLabel() - { - bool displayBySetting = SettingsManager.GetBool(SettingKeys.DISPLAY_PRIZING_ERROR, false); - bool hasError = PlayerPrefs.GetInt(PrefsKeyVault.PRIZE_ERROR, 0) == 1; - smallPrizeErrorCG.alpha = displayBySetting && hasError ? 1 : 0; - } - - private void UpdatePrices() - { - bool free = SettingsManager.GetBool(SettingKeys.FREEPLAY, false); - if (!free) - { - int pricePve = PlayerPrefs.GetInt(PrefsKeyVault.PRICE_PVE, 10); - int pricePvp = PlayerPrefs.GetInt(PrefsKeyVault.PRICE_PVP, 10); - - pricePveLabel.text = pricePve > 0 ? $"{pricePrefix}{pricePve} {PaymentSystem.ValutaName}" : "Бесплатно"; - pricePvpLabel.text = pricePvp > 0 ? $"{pricePrefix}{pricePve} {PaymentSystem.ValutaName}" : "Бесплатно"; - } - - var alfa = free ? 0 : 1; - pricePveCG.alpha = alfa; - pricePvpCG.alpha = alfa; - } - - private void SetupSerial() => serialLabel.text = PlayerPrefs.GetString(PrefsKeyVault.SERIAL, serialDefault); -} \ No newline at end of file diff --git a/Assets/Scripts/Menu/MenuController.cs.meta b/Assets/Scripts/Menu/MenuController.cs.meta deleted file mode 100644 index 8988ce5..0000000 --- a/Assets/Scripts/Menu/MenuController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: d133b2b4d98bff34f8e91f7744df602a \ No newline at end of file diff --git a/Assets/Scripts/Menu/MenuLayoutController.cs b/Assets/Scripts/Menu/MenuLayoutController.cs index cebf945..4c330a2 100644 --- a/Assets/Scripts/Menu/MenuLayoutController.cs +++ b/Assets/Scripts/Menu/MenuLayoutController.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using UnityEngine; -public class MenuLayoutController : MonoBehaviour +public class MenuLayoutController : MonoBehaviour, IControlable { [SerializeField] List panels; int panelIndex = 0; + public bool ControlsEnabled { get; set; } + public void Initialize() { foreach (var panel in panels) @@ -13,24 +15,28 @@ public class MenuLayoutController : MonoBehaviour panel.Disable(0); } panels[panelIndex].Enable(0, 0); + ControlsEnabled = true; } - private void Update() + public void UpdateControls() { int direction = GetDirection(); int newPanelIndex = Mathf.Clamp(panelIndex + direction, 0, 2); bool indexChanged = newPanelIndex != panelIndex; + var currentPanel = panels[panelIndex]; + if (indexChanged) { - var currentPanel = panels[panelIndex]; var nextPanel = panels[newPanelIndex]; - currentPanel.Disable(0); nextPanel.Enable(0, 0); panelIndex = newPanelIndex; } + + if (In.GetButtonDownAnyPlayer(PlayerAction.action)) + currentPanel.Interact(); } private static int GetDirection() diff --git a/Assets/Scripts/Menu/Rules/RulesPrizePanel.cs b/Assets/Scripts/Menu/Rules/RulesPrizePanel.cs index 594a87b..1bfcb37 100644 --- a/Assets/Scripts/Menu/Rules/RulesPrizePanel.cs +++ b/Assets/Scripts/Menu/Rules/RulesPrizePanel.cs @@ -75,7 +75,7 @@ public class RulesPrizePanel : MonoBehaviour } private void GenerateScale() { - characters = CharacterController.I.characters; + characters = CharactersController.GetCharactersArray(); prizes = PrizeSerializer.LoadPrizes(); generatedObjects = new(); diff --git a/Assets/Scripts/Menu/SpecialPrizeView.cs b/Assets/Scripts/Menu/SpecialPrizeView.cs index 0263bab..189b061 100644 --- a/Assets/Scripts/Menu/SpecialPrizeView.cs +++ b/Assets/Scripts/Menu/SpecialPrizeView.cs @@ -21,7 +21,7 @@ public class SpecialPrizeView : MonoBehaviour { var qrPrizes = prizes.OfType().ToList(); - bool prizing = SettingsManager.GetBool(SettingKeys.PRIZING, false); + bool prizing = SettingsManager.GetBool(SettingKey.PRIZING); bool hasQrPrizes = qrPrizes.Count > 0; bool needToDisplay = prizing && hasQrPrizes; diff --git a/Assets/Scripts/MenuGameplayTransit.cs b/Assets/Scripts/MenuGameplayTransit.cs new file mode 100644 index 0000000..8018c99 --- /dev/null +++ b/Assets/Scripts/MenuGameplayTransit.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +public class MenuGameplayTransit : MonoBehaviour +{ + public void StartGame() + { + + } + + public void GotoMenu() + { + + } +} diff --git a/Assets/Scripts/MenuGameplayTransit.cs.meta b/Assets/Scripts/MenuGameplayTransit.cs.meta new file mode 100644 index 0000000..47c8281 --- /dev/null +++ b/Assets/Scripts/MenuGameplayTransit.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: abfc53344afd3dd46b1dcb865ac37f9c \ No newline at end of file diff --git a/Assets/Scripts/Settings/ButtonTester.cs b/Assets/Scripts/Settings/ButtonTester.cs deleted file mode 100644 index 8a75aa5..0000000 --- a/Assets/Scripts/Settings/ButtonTester.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System.Collections; -using UnityEngine; -using UnityEngine.UI; - -[RequireComponent(typeof(Graphic))] -public class ButtonTester : MonoBehaviour -{ - public bool active = false; - - public ButtonPinMapping button; - public float fadeTime = 0.1f; - - Vector4 normalColor = new Vector4(1, 1, 1, 0.2f); - Vector4 pressedColor = new Vector4(1, 1, 1, 1); - - Vector4 targetColor; - - Graphic graphic; - - Coroutine coroutine; - - /* private void Update() - { - if (button == ButtonPinMapping) - }*/ - - - private void OnEnable() - { - graphic = GetComponent(); - graphic.color = normalColor; - targetColor = normalColor; - coroutine = StartCoroutine(ButtonAnimation()); - } - private void OnDisable() - { - if (coroutine != null) StopCoroutine(coroutine); - coroutine = null; - } - - public void EmulatePress() - { - graphic.color = pressedColor; - } - - IEnumerator ButtonAnimation() - { - while (true) - { - Vector4 oldColor = targetColor; - if (active) - { - targetColor = In.GetButton(button) ? pressedColor : normalColor; - } - - if (oldColor != targetColor && targetColor == pressedColor) - { - SoundManager.instance.playSwitch(); - } - - - Vector4 color = graphic.color; - color = Vector4.MoveTowards(color, targetColor, Time.deltaTime / fadeTime); - graphic.color = color; - - yield return null; - } - } - - -} diff --git a/Assets/Scripts/Settings/ButtonTester.cs.meta b/Assets/Scripts/Settings/ButtonTester.cs.meta deleted file mode 100644 index 11cd422..0000000 --- a/Assets/Scripts/Settings/ButtonTester.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b5c5eb049fac9ad4abb6fe960d3429b6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs b/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs deleted file mode 100644 index 4ed5eaa..0000000 --- a/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ButtonsBlock : MonoBehaviour -{ - [SerializeField] GameObject left1; - [SerializeField] GameObject right1; - [SerializeField] GameObject left2; - [SerializeField] GameObject right2; - - public void SetupBlock(List buttons) - { - left1.SetActive(false); - right1.SetActive(false); - left2.SetActive(false); - right2.SetActive(false); - - foreach (var button in buttons) - { - switch (button) - { - case ButtonPinMapping.left1: - left1.SetActive(true); break; - case ButtonPinMapping.right1: - right1.SetActive(true); break; - case ButtonPinMapping.left2: - left2.SetActive(true); break; - case ButtonPinMapping.right2: - right2.SetActive(true); break; - } - } - } -} diff --git a/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs.meta b/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs.meta deleted file mode 100644 index 4862cda..0000000 --- a/Assets/Scripts/Settings/Combinator/ButtonsBlock.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eea78f3741bfbee4d9e8d6322fb39f3b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab b/Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab deleted file mode 100644 index dcf60d0..0000000 --- a/Assets/Scripts/Settings/Combinator/ButtonsBlock.prefab +++ /dev/null @@ -1,358 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2821175415203750607 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4889428564563509643} - - component: {fileID: 6405019025578061207} - - component: {fileID: 4689534101030665051} - m_Layer: 5 - m_Name: BlueLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4889428564563509643 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2821175415203750607} - 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: 5413190144092628433} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 60, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &6405019025578061207 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2821175415203750607} - m_CullTransparentMesh: 1 ---- !u!114 &4689534101030665051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2821175415203750607} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 91ffa041b87ca1d488805f64741c0d23, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5437875857742746639 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2763904398421643935} - - component: {fileID: 7471588334737950548} - - component: {fileID: 7225638713873009949} - m_Layer: 5 - m_Name: OrangeLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2763904398421643935 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5437875857742746639} - 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: 5413190144092628433} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &7471588334737950548 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5437875857742746639} - m_CullTransparentMesh: 1 ---- !u!114 &7225638713873009949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5437875857742746639} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 82dc351fef411f144819cc8a5cfc27e8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5552885840475103763 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5413190144092628433} - - component: {fileID: 3167409617353681154} - m_Layer: 5 - m_Name: ButtonsBlock - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5413190144092628433 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5552885840475103763} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2763904398421643935} - - {fileID: 3608764277625047623} - - {fileID: 4889428564563509643} - - {fileID: 5353539673461879878} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 140, y: 25} - m_Pivot: {x: 0, y: 1} ---- !u!114 &3167409617353681154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5552885840475103763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eea78f3741bfbee4d9e8d6322fb39f3b, type: 3} - m_Name: - m_EditorClassIdentifier: - left1: {fileID: 5437875857742746639} - right1: {fileID: 7760439416534993933} - left2: {fileID: 2821175415203750607} - right2: {fileID: 8050124441397092275} ---- !u!1 &7760439416534993933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3608764277625047623} - - component: {fileID: 8236032237483445135} - - component: {fileID: 1505309785328171119} - m_Layer: 5 - m_Name: OrangeRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3608764277625047623 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760439416534993933} - 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: 5413190144092628433} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 30, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &8236032237483445135 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760439416534993933} - m_CullTransparentMesh: 1 ---- !u!114 &1505309785328171119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760439416534993933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 82dc351fef411f144819cc8a5cfc27e8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8050124441397092275 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5353539673461879878} - - component: {fileID: 3318556735856732145} - - component: {fileID: 6474669789768806247} - m_Layer: 5 - m_Name: BlueRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5353539673461879878 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8050124441397092275} - 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: 5413190144092628433} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 90, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &3318556735856732145 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8050124441397092275} - m_CullTransparentMesh: 1 ---- !u!114 &6474669789768806247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8050124441397092275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 91ffa041b87ca1d488805f64741c0d23, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/Combinator/CircleTimer.prefab b/Assets/Scripts/Settings/Combinator/CircleTimer.prefab deleted file mode 100644 index 9df96d0..0000000 --- a/Assets/Scripts/Settings/Combinator/CircleTimer.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6354146166114377328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1131195992057352333} - - component: {fileID: 5105761651860718174} - - component: {fileID: 2834349127443428636} - m_Layer: 5 - m_Name: CircleTimer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1131195992057352333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6354146166114377328} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 12.5, y: -215} - m_SizeDelta: {x: 25, y: 25} - m_Pivot: {x: 0, y: 1} ---- !u!222 &5105761651860718174 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6354146166114377328} - m_CullTransparentMesh: 1 ---- !u!114 &2834349127443428636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6354146166114377328} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d6432ff047c62946a41e3235f28ba57, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/Combinator/CircleTimer.prefab.meta b/Assets/Scripts/Settings/Combinator/CircleTimer.prefab.meta deleted file mode 100644 index ebea087..0000000 --- a/Assets/Scripts/Settings/Combinator/CircleTimer.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2a699ee167c845b4790c35ceb45494b4 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/Combination.cs b/Assets/Scripts/Settings/Combinator/Combination.cs deleted file mode 100644 index a47561c..0000000 --- a/Assets/Scripts/Settings/Combinator/Combination.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Events; -using UnityEngine.UI; - -[Serializable] -public class Combination -{ - public string description; - public List buttons; - [SerializeField] UnityEvent OnActivated; - - private Image timerImage; - - float pressedTime = 0; - float timeToGo = 1.5f; - - public bool Process() - { - timerImage.fillAmount = pressedTime / timeToGo; - bool condition = checkCondition(); - if (condition) - { - pressedTime += Time.deltaTime; - - if (pressedTime >= timeToGo) - { - OnActivated?.Invoke(); - pressedTime = 0; - } - } - else - { - pressedTime -= Time.deltaTime; - pressedTime = Mathf.Clamp(pressedTime, 0, timeToGo); - } - return condition; - } - private bool checkCondition() - { - bool res = true; - foreach (ButtonPinMapping button in buttons) - { - res = res && In.GetButton(button); - } - return res; - } - public void SetImageLink(Image image) => timerImage = image; - -} diff --git a/Assets/Scripts/Settings/Combinator/Combination.cs.meta b/Assets/Scripts/Settings/Combinator/Combination.cs.meta deleted file mode 100644 index 9ffc21b..0000000 --- a/Assets/Scripts/Settings/Combinator/Combination.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e0a7e74e983688449a64f0ce79ad0db5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/CombinatorManger.cs b/Assets/Scripts/Settings/Combinator/CombinatorManger.cs deleted file mode 100644 index b94255f..0000000 --- a/Assets/Scripts/Settings/Combinator/CombinatorManger.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class CombinatorManger : MonoBehaviour -{ - [SerializeField] List CombinationPanels; - int currentPanelIndex; - - private void OnEnable() => Initialize(); - - private void OnDisable() => CloseAllPanels(); - - private void Update() - { - int direction = GetDirection(); - SwitchPanel(direction); - - } - - - public void Initialize() - { - currentPanelIndex = 0; - - CloseAllPanels(); - OpenPanel(0); - } - - public void SwitchPanel(int direction) - { - if (direction == 0) return; - - CloseAllPanels(); - - currentPanelIndex = (currentPanelIndex + direction + CombinationPanels.Count) % CombinationPanels.Count; - OpenPanel(currentPanelIndex); - } - public void OpenPanel(int index) - { - CombinationPanels[index].Generate(); - } - public void CloseAllPanels() - { - foreach (CombinatorPanel panel in CombinationPanels) - { - panel.Clear(); - } - } - - - private int GetDirection() - { - int direction = 0; - if (In.GetButtonDown(ButtonPinMapping.startOnePlayer)) { direction -= 1; } - if (In.GetButtonDown(ButtonPinMapping.startTwoPlayers)) { direction += 1; } - - return direction; - } - - -} diff --git a/Assets/Scripts/Settings/Combinator/CombinatorManger.cs.meta b/Assets/Scripts/Settings/Combinator/CombinatorManger.cs.meta deleted file mode 100644 index 1c33223..0000000 --- a/Assets/Scripts/Settings/Combinator/CombinatorManger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a57ff012a936984a880bad33d0f0037 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs b/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs deleted file mode 100644 index 35ce4f7..0000000 --- a/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class CombinatorPanel : MonoBehaviour -{ - [Header("Настройки генерации", order = 0)] - [SerializeField] float leftOffset = 10; - [SerializeField] float upOffset = -10; - [SerializeField] float verticalGap = 50; - [SerializeField] GameObject timerPrefab; - [SerializeField] GameObject labelPrefab; - [SerializeField] GameObject buttonsBlockPrefab; - - List generatedObjects; - - bool ready = false; - - - [Header("Комбинации", order = 0)] - [SerializeField] List Combinations; - - void Update() => ProcessCombinations(); - //private void OnEnable() => Generate(); - //private void OnDisable() => Clear(); - public void Clear() - { - if (generatedObjects == null) return; - - foreach (GameObject go in generatedObjects) - { - Destroy(go); - } - ready = false; - } - - void ProcessCombinations() - { - if (!ready) return; - - foreach(Combination comb in Combinations) - { - if (comb.Process()) break; - } - } - - public void Generate() - { - generatedObjects = new(); - - int i = 0; - foreach(Combination combo in Combinations) - { - float commonY = upOffset - i * verticalGap; - //таймер - GameObject timer = Instantiate(timerPrefab, transform); - RectTransform rect = timer.GetComponent(); - rect.anchoredPosition = new Vector2(leftOffset, commonY); - timer.GetComponent().fillAmount = 0; - combo.SetImageLink(timer.GetComponent()); - - - - GameObject label = Instantiate(labelPrefab, transform); - rect = label.GetComponent(); - rect.anchoredPosition = new Vector2(leftOffset+30, commonY); - label.GetComponent().text = combo.description; - - GameObject buttonsBlock = Instantiate(buttonsBlockPrefab, transform); - rect = buttonsBlock.GetComponent(); - rect.anchoredPosition = new Vector2(leftOffset + 30 + 400, commonY); - buttonsBlock.GetComponent().SetupBlock(combo.buttons); - - generatedObjects.Add(timer); - generatedObjects.Add(label); - generatedObjects.Add(buttonsBlock); - - i++; - } - ready = true; - } - -} diff --git a/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs.meta b/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs.meta deleted file mode 100644 index 24abb01..0000000 --- a/Assets/Scripts/Settings/Combinator/CombinatorPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 34c784eef8085974fa72bcabc3ec1b5e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Combinator/ComboLabel.prefab b/Assets/Scripts/Settings/Combinator/ComboLabel.prefab deleted file mode 100644 index 6f1603b..0000000 --- a/Assets/Scripts/Settings/Combinator/ComboLabel.prefab +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4958219866077983714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3287603856643533345} - - component: {fileID: 4041490900050376076} - - component: {fileID: 5108930201896258092} - m_Layer: 5 - m_Name: ComboLabel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3287603856643533345 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4958219866077983714} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 25} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4041490900050376076 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4958219866077983714} - m_CullTransparentMesh: 1 ---- !u!114 &5108930201896258092 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4958219866077983714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u0441\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0432\u044B\u0434\u0430\u043D\u043D\u044B\u0435 - \u043F\u0440\u0438\u0437\u044B \u2013 " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290888129 - m_fontColor: {r: 0.7584905, g: 0.7584905, b: 0.7584905, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: -46.9 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/Combinator/SettingsActions.cs b/Assets/Scripts/Settings/Combinator/SettingsActions.cs deleted file mode 100644 index 674f2a3..0000000 --- a/Assets/Scripts/Settings/Combinator/SettingsActions.cs +++ /dev/null @@ -1,95 +0,0 @@ -using TMPro; -using UnityEngine; -using PrizeSystem; - -public class SettingsActions : MonoBehaviour -{ - [SerializeField] GameObject IO_test; - [SerializeField] AudioClip testSound; - [SerializeField] GameObject ScreenTester; - - [SerializeField] AudioClip prizingDisabled; - private GameManager gm => GameManager.instance; - - - private IState CurrentState => GameManager.instance.stateMachine.currentState; - private void OnEnable() - { - SettingsManager.OnSettingsChanged?.AddListener(RefreshUI); - PaymentSystem.onCoinAdded += RefreshUI; - PaymentSystem.onCoinRemoved += RefreshUI; - - RefreshUI(); - } - private void OnDisable() - { - SettingsManager.OnSettingsChanged?.RemoveListener(RefreshUI); - PaymentSystem.onCoinAdded -= RefreshUI; - PaymentSystem.onCoinRemoved -= RefreshUI; - } - - public void ResetCoinsCounter() - { - PlayerPrefs.SetInt(PrefsKeyVault.CASH_COUNTER_NUL, 0); - RefreshUI(); - } - public void ResetPrizes() - { - PrizeSystemManager.ResetPrizeCounters(); - RefreshUI(); - } - - //Смены состояний - public void EnterPvePrice() => gm.stateMachine.ChangeState(new EnterPricePVEState(CurrentState)); - public void EnterPveRevengePrice() => gm.stateMachine.ChangeState(new EnterPricePVERevengeState(CurrentState)); - public void EnterPvpPrice() => gm.stateMachine.ChangeState(new EnterPricePVPState(CurrentState)); - public void EnterSupportNumber() => gm.stateMachine.ChangeState(new GetNumberState(CurrentState)); - public void EnterPrizesAvailable() => gm.stateMachine.ChangeState(new EnterPrizesAvailableState(CurrentState)); - public void ResetPrizeError() => PlayerPrefs.SetInt(PrefsKeyVault.PRIZING_ERROR_REGISTRED, 0); - public void EnterPrizesSettings() => gm.stateMachine.ChangeState(new EnterPrizesAvailableState(CurrentState)); - public void ConfigurePrizes() => gm.stateMachine.ChangeState(new EnterPrizesForCharactersState(CurrentState)); - public void ConfigurePulsesToResetDifficulty() => gm.stateMachine.ChangeState(new EnterPulsesToResetDifficulty(CurrentState)); - public void ConfigureValutaPerPulse() => gm.stateMachine.ChangeState(new EnterValutaPerImpulse(CurrentState)); - public void EnterValutaName() => gm.stateMachine.ChangeState(new EnterValutaNameState(CurrentState)); - public void EnterIO_test() => gm.stateMachine.ChangeState(new IoTestState(IO_test, CurrentState)); - public void EnterNumberTech() => gm.stateMachine.ChangeState(new EnterNumberTech(CurrentState)); - - //Панель2 - public void HopperTest() - { - if (SettingsManager.GetBool("Prizing", false)) - { - PrizeSystemManager.GivePrize(new CountablePrize(CountablePrizeType.Hopper, 1)); - } - else - { - SoundManager.instance.playClip(prizingDisabled); - } - } - public void SoundTest() => SoundManager.instance.playClip(testSound); - public void ScreenTest() => ScreenTester.SetActive(true); - public void ResetBalance() - { - PaymentSystem.ResetBalance(); - SettingsManager.OnSettingsChanged?.Invoke(); - } - - string PRIZE_BASE = "Счетчик призов "; - string STARTS_BASE = "Выручка "; - string NULLABLE = "(обнуляемый)"; - string UNNULLABLE = "(глобальный)"; - public TextMeshProUGUI starts, startsNul, prize, prizeNul; - void RefreshUI() - { - var valutaName = PaymentSystem.ValutaName; - - starts.text = STARTS_BASE + UNNULLABLE + ": " + PlayerPrefs.GetInt(PrefsKeyVault.CASH_COUNTER) + " " + valutaName; - startsNul.text = STARTS_BASE + NULLABLE + ": " + PlayerPrefs.GetInt(PrefsKeyVault.CASH_COUNTER_NUL) + " " + valutaName; - - prize.text = PRIZE_BASE + UNNULLABLE + ": " + PrizeSystemManager.GetPrizesCounterString(); - prizeNul.text = PRIZE_BASE + NULLABLE + ": " + PrizeSystemManager.GetPrizesCounterNullableString(); - } - - void RefreshUI(int a) => RefreshUI(); - -} diff --git a/Assets/Scripts/Settings/Combinator/SettingsActions.cs.meta b/Assets/Scripts/Settings/Combinator/SettingsActions.cs.meta deleted file mode 100644 index 255de95..0000000 --- a/Assets/Scripts/Settings/Combinator/SettingsActions.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4da4e82c58702a84f8bb59908fdd994c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/CounterRecordView.cs b/Assets/Scripts/Settings/CounterRecordView.cs new file mode 100644 index 0000000..d0dcb31 --- /dev/null +++ b/Assets/Scripts/Settings/CounterRecordView.cs @@ -0,0 +1,16 @@ +using TMPro; +using UnityEngine; + +public class CounterRecordView : MonoBehaviour +{ + [SerializeField] private TextMeshProUGUI _counterNameLabel; + [SerializeField] private TextMeshProUGUI _counterAmountLabel; + + public void Configure(/*CountersSystem.CounterRecord record*/) + { + /*_counterNameLabel.text = record.Name; + if (record.Resettable) _counterNameLabel.text += "(обнуляемый)"; + + _counterAmountLabel.text = CountersSystem.GetCount(record).ToString();*/ + } +} diff --git a/Assets/Scripts/Settings/CounterRecordView.cs.meta b/Assets/Scripts/Settings/CounterRecordView.cs.meta new file mode 100644 index 0000000..0f6e602 --- /dev/null +++ b/Assets/Scripts/Settings/CounterRecordView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e8316cb917d3c2941adb9293a82cc494 \ No newline at end of file diff --git a/Assets/Scripts/Settings/CountersPanel.cs b/Assets/Scripts/Settings/CountersPanel.cs new file mode 100644 index 0000000..e4f04ff --- /dev/null +++ b/Assets/Scripts/Settings/CountersPanel.cs @@ -0,0 +1,43 @@ +using System; +using UnityEngine; + +public class CountersPanel : MonoBehaviour, ICompletable +{ + public event Action OnComplete; + + [SerializeField] private CounterRecordView _recordViewPrefab; + [SerializeField] private Transform _group; + [SerializeField] private InSignal _exitSignal/* = InSignal.UpRight*/; + + private void OnEnable() => Generate(); + private void OnDisable() => Clear(); + private void OnDestroy() => Clear(); + + private void Update() + { + if (In.GetButtonDown(_exitSignal)) Exit(); + } + + private void Generate() + { + //foreach (var record in CountersSystem.Records) + //{ + // var go = Instantiate(_recordViewPrefab.gameObject, _group); + // go.GetComponent().Configure(record); + //} + } + + private void Exit() + { + OnComplete?.Invoke(); + gameObject.SetActive(false); + } + + private void Clear() + { + for (int i = _group.childCount - 1; i >= 0; i--) + { + Destroy(_group.GetChild(i).gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/CountersPanel.cs.meta b/Assets/Scripts/Settings/CountersPanel.cs.meta new file mode 100644 index 0000000..ef6710e --- /dev/null +++ b/Assets/Scripts/Settings/CountersPanel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: de4abf9c590272749af474b35ba4cf1c \ No newline at end of file diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab deleted file mode 100644 index 081917d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab +++ /dev/null @@ -1,174 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0421\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442 \u0431\u0430\u043B\u0430\u043D\u0441 - (\u0441\u0447\u0435\u0442\u0447\u0438\u043A \u0432\u043D\u0435\u0441\u0435\u043D\u043D\u043E\u0439 - \u0432\u0430\u043B\u044E\u0442\u044B) \u0434\u043E \u043D\u0443\u043B\u044F." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "C\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0431\u0430\u043B\u0430\u043D\u0441" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab.meta deleted file mode 100644 index cb3d174..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить баланс.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f1b38f94252bdb949a1235fa032e73da -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab deleted file mode 100644 index 37bb4bc..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab +++ /dev/null @@ -1,174 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0421\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442 \u043E\u0431\u043D\u0443\u043B\u044F\u0435\u043C\u044B\u0439 - \u0441\u0447\u0435\u0442\u0447\u0438\u043A \u0432\u044B\u0440\u0443\u0447\u043A\u0438" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "C\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0441\u0447\u0435\u0442\u0447\u0438\u043A - \u0432\u044B\u0440\u0443\u0447\u043A\u0438" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab.meta deleted file mode 100644 index 548df08..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Cбросить счетчик выручки.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 05c9bf5315c80f049a30239fff2cd8bf -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs b/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs deleted file mode 100644 index 9f476c9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs +++ /dev/null @@ -1,22 +0,0 @@ -using TMPro; -using UnityEngine; - -public class ColorAnimation : MonoBehaviour -{ - public TextMeshProUGUI label; - public float speed = 1f; - private float hue = 0f; - - private void Update() - { - // Изменяем оттенок (hue) от 0 до 1 - hue += Time.deltaTime * speed; - hue %= 1f; // Ограничиваем от 0 до 1 - - // Преобразуем HSV в RGB - Color color = Color.HSVToRGB(hue, 1f, 1f); - string hexColor = ColorUtility.ToHtmlStringRGB(color); - - label.text = $"- Запускает цветовую анимацию для оценки качества картинки."; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs.meta deleted file mode 100644 index dd03d30..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/TextColorAnim.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fe8afb9103e17af46a5c2e5c211c3ff3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab deleted file mode 100644 index 913ca1d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab +++ /dev/null @@ -1,180 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0432\u0430\u043B\u044E\u0442\u044B - \u0437\u0430 \u0438\u043C\u043F\u0443\u043B\u044C\u0441.\n- \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 - \u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0438\u0433\u0440\u043E\u0432\u043E\u0439 - \u0432\u0430\u043B\u044E\u0442\u044B \u043D\u0430\u0447\u0438\u0441\u043B\u044F\u0435\u0442\u0441\u044F - \u0437\u0430 \u0438\u043C\u043F\u0443\u043B\u044C\u0441 \u043E\u0442 \u043F\u043B\u0430\u0442\u0435\u0436\u043D\u044B\u0445 - \u0441\u0438\u0441\u0442\u0435\u043C.\n- \u041A\u0430\u043A \u043F\u0440\u0430\u0432\u0438\u043B\u043E - \u043E\u0434\u043D\u0430 \u043E\u043F\u043B\u0430\u0442\u0430 - \u043E\u0434\u0438\u043D - \u0438\u043C\u043F\u0443\u043B\u044C\u0441." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0412\u0430\u043B\u044E\u0442\u0430 \u0437\u0430 \u0438\u043C\u043F\u0443\u043B\u044C\u0441" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab.meta deleted file mode 100644 index 61284b3..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Валюта за импульс.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 01e62ce41db1fff49b1f8122ba629e74 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab deleted file mode 100644 index d75be1d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab +++ /dev/null @@ -1,175 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u0434\u043B\u044F \u0432\u043D\u0435\u0441\u0435\u043D\u0438\u044F \u043E\u0441\u0442\u0430\u0442\u043A\u0430 - \u043F\u0440\u0438\u0437\u043E\u0432 \u0432 \u0430\u043F\u043F\u0430\u0440\u0430\u0442\u0435" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0412\u043D\u0435\u0441\u0442\u0438 \u043E\u0441\u0442\u0430\u0442\u043E\u043A - \u043F\u0440\u0438\u0437\u043E\u0432" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab.meta deleted file mode 100644 index 30d6aaa..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Внести остаток призов.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 10cbebedafb2df241b9eddf05f288915 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab deleted file mode 100644 index e06ed7d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab +++ /dev/null @@ -1,180 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E - \u0438\u043C\u043F\u0443\u043B\u044C\u0441\u043E\u0432 \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u044B\u044B\u0445 - \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0445\u043E\u0434\u0430 \u0441 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u044F - \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u043D\u043E\u0439 \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438 - \u0432 \u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u043E\u0431\u044B\u0447\u043D\u043E\u0439 - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438.\n- \u0412\u043D\u0443\u0442\u0440\u0438 - \u0431\u043E\u043B\u0435\u0435 \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0435 - \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0418\u043C\u043F\u0443\u043B\u044C\u0441\u043E\u0432 \u0434\u043E \u0441\u0431\u0440\u043E\u0441\u0430 - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab.meta deleted file mode 100644 index 3aa60f1..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Импульсов до сброса сложности.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9f236f027f147c64daa37c690d4437e6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab deleted file mode 100644 index 1fcbe5e..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab +++ /dev/null @@ -1,176 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u044F - \u0432\u0430\u043B\u044E\u0442\u044B.\n- \u042D\u0442\u043E \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 - \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044F \u0432\u043C\u0435\u0441\u0442\u0435 - \u0441 \u0446\u0435\u043D\u0430\u043C\u0438 \u0440\u0435\u0436\u0438\u043C\u043E\u0432" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -25.55 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432\u0430\u043B\u044E\u0442\u044B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab.meta deleted file mode 100644 index 8f8e4bd..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Название валюты.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e65822cfbebdb764aa4907f5dfeeb1bb -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab deleted file mode 100644 index 50e80c9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab +++ /dev/null @@ -1,181 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u0434\u043B\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u0440\u0438\u0437\u043E\u0432 - \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0445 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439.\n- - \u041A\u0430\u0436\u0434\u043E\u043C\u0443 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0443 - \u043C\u043E\u0436\u043D\u043E \u0437\u0430\u0434\u0430\u0442\u044C \u0441\u0432\u043E\u0439 - \u043F\u0440\u0438\u0437.\n- \u0421\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0439 - \u043F\u0440\u0438\u0437 \u043C\u043E\u0436\u043D\u043E \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C - \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C\u0443 - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0443" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u041D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043F\u0440\u0438\u0437\u044B - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab.meta deleted file mode 100644 index a432f3a..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Настроить призы персонажей.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 234bf932bd72c9f449430c46d0e433ae -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab deleted file mode 100644 index bd9baac..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u0432\u0432\u043E\u0434\u0430 \u043D\u043E\u043C\u0435\u0440\u0430 \u0442\u0435\u043B\u0435\u0444\u043E\u043D\u0430 - \u0434\u043B\u044F \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u043E\u0432\n- - \u0414\u043B\u044F \u0420\u043E\u0441\u0441\u0438\u0438 \u043D\u0443\u0436\u043D\u043E - \u0437\u0430\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u043D\u043E\u043C\u0435\u0440 - \u0441 7. \u041D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: 79998887766" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u041D\u043E\u043C\u0435\u0440 \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u043E\u0432" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab.meta deleted file mode 100644 index 00b7434..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер выдачи призов.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 882fab95e040ec64d937311be559f72e -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab deleted file mode 100644 index 4083fc6..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u0432\u0432\u043E\u0434\u0430 \u043D\u043E\u043C\u0435\u0440\u0430 \u0442\u0435\u043B\u0435\u0444\u043E\u043D\u0430 - \u0442\u0435\u0445\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438\n- \u0414\u043B\u044F - \u0420\u043E\u0441\u0441\u0438\u0438 \u043D\u0443\u0436\u043D\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u044F\u0442\u044C - \u043D\u043E\u043C\u0435\u0440 \u0441 7. \u041D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: - 79998887766" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u041D\u043E\u043C\u0435\u0440 \u0442\u0435\u0445\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0438" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab.meta deleted file mode 100644 index e2382ec..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Номер техподдержки.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 599c21b97aa7c4c4f9fb84b5cb425245 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab deleted file mode 100644 index 7dfacca..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab +++ /dev/null @@ -1,175 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0421\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442 \u043E\u0431\u043D\u0443\u043B\u044F\u0435\u043C\u044B\u0439 - \u0441\u0447\u0435\u0442\u0447\u0438\u043A \u0432\u044B\u0434\u0430\u043D\u043D\u044B\u0445 - \u043F\u0440\u0438\u0437\u043E\u0432." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0432\u044B\u0434\u0430\u043D\u043D\u044B\u0435 - \u043F\u0440\u0438\u0437\u044B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab.meta deleted file mode 100644 index 533c497..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить выданные призы.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 20cb8bb7a39b15d4aaf6b8a2f3968254 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab deleted file mode 100644 index 3885d8b..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab +++ /dev/null @@ -1,174 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0421\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 - \u043E\u0448\u0438\u0431\u043A\u0438 \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u0430." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043E\u0448\u0438\u0431\u043A\u0443 - \u0432\u044B\u0434\u0430\u0447\u0438" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab.meta deleted file mode 100644 index 5e6192d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Сбросить ошибку выдачи.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c200b1a136f8ad5419cb637f0d7d1758 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab deleted file mode 100644 index 0a877d5..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab +++ /dev/null @@ -1,176 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u0432\u0432\u043E\u0434\u0430 \u0441\u0443\u043F\u0435\u0440 \u043F\u0440\u0438\u0437\u0430.\n- - \u0414\u043B\u044F \u0432\u0432\u043E\u0434\u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B - \u0440\u0443\u0441\u0441\u043A\u0438\u0435 \u0431\u0443\u043A\u0432\u044B \u0438 - \u0446\u0438\u0444\u0440\u044B." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0421\u0443\u043F\u0435\u0440\u043F\u0440\u0438\u0437" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab.meta deleted file mode 100644 index cec7a8c..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Суперприз.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: daa0cb3548628aa4c9ace4f958b1dada -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab deleted file mode 100644 index a136888..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab +++ /dev/null @@ -1,183 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 - qr-\u043A\u043E\u0434\u0430 \u0434\u043B\u044F \u0432\u044B\u0434\u0430\u0447\u0438 - \u0441\u0443\u043F\u0435\u0440 \u043F\u0440\u0438\u0437\u0430.\n- \u041F\u0435\u0440\u0435\u0434 - \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435\u043C - \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u0435 - \u043D\u043E\u043C\u0435\u0440 \u0442\u0435\u043B\u0435\u0444\u043E\u043D\u0430 - \u0442.\u043A. qr-\u043A\u043E\u0434 \u0433\u0435\u043D\u0435\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044F - \u0438\u0437 \u043D\u0435\u0433\u043E.\n- \u0415\u0441\u043B\u0438 \u043D\u0435 - \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043D\u043E\u043C\u0435\u0440, - \u0442\u043E qr-\u043A\u043E\u0434 \u0431\u0443\u0434\u0435\u0442 \u0432 \u0432\u0438\u0434\u0435 - \u0431\u0435\u043B\u043E\u0433\u043E \u043A\u0432\u0430\u0434\u0440\u0430\u0442\u0430" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -25.06 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0422\u0435\u0441\u0442 QR \u043A\u043E\u0434\u043E\u0432" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab.meta deleted file mode 100644 index 434774e..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест QR кодов.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: af7f040f017d3dc47a12c19125280707 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab deleted file mode 100644 index a089860..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab +++ /dev/null @@ -1,174 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0412\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442 - \u0442\u0435\u0441\u0442\u043E\u0432\u0443\u044E \u0440\u0435\u043F\u043B\u0438\u043A\u0443 - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0430." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0422\u0435\u0441\u0442 \u0437\u0432\u0443\u043A\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab.meta deleted file mode 100644 index 593177d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест звука.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e9485c9faff55d644bef5a4cd66153a6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab deleted file mode 100644 index efedc2e..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab +++ /dev/null @@ -1,175 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u043E\u0439 \u043C\u043E\u0436\u043D\u043E - \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u0440\u0430\u0431\u043E\u0442\u043E\u0441\u043F\u043E\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u044C - \u043A\u0430\u0436\u0434\u043E\u0439 \u043A\u043D\u043E\u043F\u043A\u0438." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0422\u0435\u0441\u0442 \u043A\u043D\u043E\u043F\u043E\u043A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab.meta deleted file mode 100644 index 9894ed9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест кнопок.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b63b2098dab0b9e4f8d798bf21958cc2 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab deleted file mode 100644 index 5612abc..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0417\u0430\u043F\u0443\u0441\u043A\u0430\u0435\u0442 \u043F\u0440\u043E\u0446\u0435\u0441\u0441 - \u0432\u044B\u0434\u0430\u0447\u0438 \u043F\u0440\u0438\u0437\u0430.\n- \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435! - \u0415\u0441\u043B\u0438 \u0432\u044B\u0434\u0430\u0447\u0430 \u043F\u0440\u0438\u0437\u0430 - \u043F\u0440\u0438 \u0438\u0433\u0440\u0435 \u0441 \u0431\u043E\u0442\u043E\u043C - \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430, \u0442\u043E \u043F\u0440\u043E\u0446\u0435\u0441\u0441 - \u043D\u0435 \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0441\u044F." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0422\u0435\u0441\u0442 \u0445\u043E\u043F\u043F\u0435\u0440\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab.meta deleted file mode 100644 index e5c10ff..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест хоппера.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2bbfea82bf423854a99ef00437773bd9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab.meta deleted file mode 100644 index 15fcdea..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ca633c95b8127b249adac1f5a89db218 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab deleted file mode 100644 index 4023754..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab +++ /dev/null @@ -1,179 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0446\u0435\u043D\u044B - \u0438\u0433\u0440\u044B \u043D\u0430 \u0434\u0432\u043E\u0438\u0445.\n- \u042D\u0442\u0430 - \u0446\u0435\u043D\u0430 \u0437\u0430\u0434\u0430\u0435\u0442\u0441\u044F \u0432 - \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u0439 \u0432\u0430\u043B\u044E\u0442\u0435 - \u0438 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0441\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C - \u0438\u0433\u0440\u044B \n\u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \"2 - \u0438\u0433\u0440\u043E\u043A\u0430\".\n" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u043D\u0430 \u0434\u0432\u043E\u0438\u0445" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab.meta deleted file mode 100644 index 0535d92..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры на двоих.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f10b3bec3401b0e4f8869982816f0cb3 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab deleted file mode 100644 index d92d21a..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab +++ /dev/null @@ -1,181 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0446\u0435\u043D\u044B - \u0438\u0433\u0440\u044B \u043F\u0440\u043E\u0442\u0438\u0432 \u0431\u043E\u0442\u0430.\n- - \u042D\u0442\u0430 \u0446\u0435\u043D\u0430 \u0437\u0430\u0434\u0430\u0435\u0442\u0441\u044F - \u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u0439 \u0432\u0430\u043B\u044E\u0442\u0435 - \u0438 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0441\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C - \u0438\u0433\u0440\u044B \n\u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \"\u0421 - \u0424\u0438\u0448\u043A\u043E\u0439\" \u043F\u0440\u0438 \u0437\u0430\u0445\u043E\u0434\u0435 - \u0432 \u0438\u0433\u0440\u0443 \u0447\u0435\u0440\u0435\u0437 \u0433\u043B\u0430\u0432\u043D\u043E\u0435 - \u043C\u0435\u043D\u044E." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0426\u0435\u043D\u0430 \u0438\u0433\u0440\u044B \u0441 \u0431\u043E\u0442\u043E\u043C" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab.meta deleted file mode 100644 index bee1b97..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена игры с ботом.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 61583e6dba133cc49abaacf9588b2517 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab deleted file mode 100644 index 171f83b..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab +++ /dev/null @@ -1,181 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u043F\u0430\u043D\u0435\u043B\u044C - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0446\u0435\u043D\u044B - \u0440\u0435\u0432\u0430\u043D\u0448\u0430.\n- \u042D\u0442\u0430 \u0446\u0435\u043D\u0430 - \u0437\u0430\u0434\u0430\u0435\u0442\u0441\u044F \u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u0439 - \u0432\u0430\u043B\u044E\u0442\u0435 \u0438 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 - \u0441\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0438\u0433\u0440\u044B - \n\u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \"\u0421 \u0424\u0438\u0448\u043A\u043E\u0439\", - \u043A\u043E\u0433\u0434\u0430 \u0438\u0433\u0440\u043E\u043A \u043D\u0430\u0436\u0438\u043C\u0430\u0435\u0442 - \"\u0415\u0449\u0435 \u0440\u0430\u0437\" \u043F\u043E\u0441\u043B\u0435 \u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0448\u0430 - \u0431\u043E\u0442\u0443." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0426\u0435\u043D\u0430 \u0440\u0435\u0432\u0430\u043D\u0448\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab.meta b/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab.meta deleted file mode 100644 index 437cefe..0000000 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Цена реванша.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b42e5d1bcb3e93c4f90860279fd6c7a0 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Setting description template.prefab b/Assets/Scripts/Settings/Descriptions/Setting description template.prefab deleted file mode 100644 index 451aca9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Setting description template.prefab +++ /dev/null @@ -1,172 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u043D\u0435 \u0437\u0430\u0434\u0430\u043D\u043E." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: Setting description template - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Setting description template.prefab.meta b/Assets/Scripts/Settings/Descriptions/Setting description template.prefab.meta deleted file mode 100644 index f929e38..0000000 --- a/Assets/Scripts/Settings/Descriptions/Setting description template.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3da6c849967083641b4128baeb7ab2cd -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs b/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs deleted file mode 100644 index f5b4886..0000000 --- a/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// Поставляет описания настроек по ID настройки -/// -public class SettingDescriptionProvider : MonoBehaviour -{ - public List settingDescriptions; - public GameObject defaultDescription; - - public GameObject GetDescription(string id) - { - //Проверки заполнения - if (settingDescriptions == null) - { - Debug.LogError("Не заданы описания настроек"); return null; - } - if (defaultDescription == null) - { - Debug.LogError("Не задано описание настройки по умолчанию"); return null; - } - - //поиск по id - GameObject foundDescription = null; - for (int i = 0; i < settingDescriptions.Count; i++) - { - if (settingDescriptions[i].id == id) - { - foundDescription = settingDescriptions[i].descriptionPrefab; - break; - } - } - - //возврат - if(foundDescription == null) - { - Debug.LogError($"Описание настройки с id: {id} не найдено. Возврат дефолтного значения"); - return defaultDescription; - } - return foundDescription; - } - - - [Serializable] - public class SettingDescription - { - public string id; - public GameObject descriptionPrefab; - } -} diff --git a/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs.meta b/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs.meta deleted file mode 100644 index 3c0ebfd..0000000 --- a/Assets/Scripts/Settings/Descriptions/SettingDescriptionProvider.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 28d7bc06abce926449048586cf2f9956 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions.meta deleted file mode 100644 index 08f6fbd..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 718b397f46022bb4f88b699cdf9cf75c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab deleted file mode 100644 index 0859af9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab +++ /dev/null @@ -1,178 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0441\u0442\u0440\u0430\u0442\u0435\u0433\u0438\u0438 - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u0438 \u0430\u043F\u043F\u0430\u0440\u0430\u0442\u0430\n-\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0435 - \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u043A\u0430\u0436\u0434\u043E\u0439 - \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043C\u043E\u0436\u043D\u043E - \u0443\u0432\u0438\u0434\u0435\u0442\u044C \u043D\u0430 \u043F\u0440\u0430\u0432\u043E\u0439 - \u043F\u0430\u043D\u0435\u043B\u0438, \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0430\u044F - \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: BaseBotDifficulty - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab.meta deleted file mode 100644 index 12caaf2..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/BaseBotDifficulty.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5156fee5377691449961d4254078b172 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab deleted file mode 100644 index 99418d1..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab +++ /dev/null @@ -1,174 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0443\u044E - \u0441\u043B\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0431\u043E\u0442\u043E\u0432 - \u0432 \u0438\u0433\u0440\u0435." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: Difficulty - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab.meta deleted file mode 100644 index db2dcc7..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Difficulty.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3b36fff5e6f3b6d4bb73d407c03e57e4 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab deleted file mode 100644 index 6eb02b7..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0412\u043A\u043B\u044E\u0447\u0430\u0442\u044C \u043D\u0430\u0434\u043F\u0438\u0441\u044C - \"\u043C\u0430\u043B\u0435\u043D\u044C\u043A\u0438\u0435 \u043F\u0440\u0438\u0437\u044B - \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u0438\u0441\u044C\" \u043A\u043E\u0433\u0434\u0430 - \u043E\u0441\u0442\u0430\u0442\u043E\u043A \u043F\u0440\u0438\u0437\u043E\u0432 - = 0\n- \u041D\u0430 \u0432\u044B\u0434\u0430\u0447\u0443 \u043F\u0440\u0438\u0437\u043E\u0432 - \u043D\u0435 \u0432\u043B\u0438\u044F\u0435\u0442." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: DisplayNoPrizes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab.meta deleted file mode 100644 index ee45c9c..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayNoPrizes.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 00a1bdf8cf92f60439bc2e7b62d53e51 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab deleted file mode 100644 index 190b75d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab +++ /dev/null @@ -1,184 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043B\u0438 - \u043E\u0448\u0438\u0431\u043A\u0443 \u0432\u044B\u0434\u0430\u0447\u0438 \u0432 - \u043C\u0435\u043D\u044E. \n- \u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u044B\u0432\u043E\u0434\u0438\u0442\u0441\u044F - \u043A\u0430\u043A \u043A\u0440\u0430\u0441\u043D\u0430\u044F \u043D\u0430\u0434\u043F\u0438\u0441\u044C - \u043F\u043E\u0434 \u0440\u0435\u0436\u0438\u043C\u043E\u043C \u0438\u0433\u0440\u044B - \u0441 \u0431\u043E\u0442\u043E\u043C.\n- \u041E\u0448\u0438\u0431\u043A\u0430 - \u043F\u0440\u043E\u0438\u0441\u0445\u043E\u0434\u0438\u0442 \u043A\u043E\u0433\u0434\u0430 - \u0430\u043F\u043F\u0430\u0440\u0430\u0442 \u043D\u0435 \u0441\u043C\u043E\u0433 - \u0432\u044B\u0434\u0430\u0442\u044C \u043F\u0440\u0438\u0437.\n- \u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C - \u043E\u0448\u0438\u0431\u043A\u0443 \u043C\u043E\u0436\u043D\u043E \u0432 \u043C\u0435\u043D\u044E, - \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0432 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 - <\u0421\u0431\u0440\u043E\u0441 \u043E\u0448\u0438\u0431\u043A\u0438 - \u0432\u044B\u0434\u0430\u0447\u0438> \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: DisplayPrizingError - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab.meta deleted file mode 100644 index 303457b..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/DisplayPrizingError.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c02493ebea8ed684097b08816b35384e -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab deleted file mode 100644 index 5c90bd0..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0438\u043B\u0438 - \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043E\u0437\u0432\u0443\u0447\u043A\u0443 - \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 - \u0438\u0433\u0440\u044B \u043F\u0440\u043E\u0442\u0438\u0432 \u0431\u043E\u0442\u0430.\n- - \u0422\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0435 \u0440\u0435\u043F\u043B\u0438\u043A\u0438 - \u043E\u0441\u0442\u0430\u043D\u0443\u0442\u0441\u044F." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: EnableVoices - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab.meta deleted file mode 100644 index 6b0ac2d..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/EnableVoices.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 04fa33976093c1644826ae8bc76d3ac7 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab deleted file mode 100644 index 5b43550..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab +++ /dev/null @@ -1,637 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0412\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C - \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0431\u044B\u0441\u0442\u0440\u043E\u0439 - \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u043E\u0432 - \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\u043C \u043C\u0435\u043D\u044E.\n- - \u0427\u0442\u043E\u0431\u044B \u0431\u044B\u0441\u0442\u0440\u043E \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C - \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u0438, \u043D\u0443\u0436\u043D\u043E - \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u044C\u0441\u044F \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\u043C - \u043C\u0435\u043D\u044E \u0438 \u0437\u0430\u0436\u0430\u0442\u044C \u043A\u043D\u043E\u043F\u043A\u0438" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -7.79 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1613895887296108390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7766316617526404552} - - component: {fileID: 6606665980366896896} - - component: {fileID: 5549818488432535375} - m_Layer: 5 - m_Name: Image.1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7766316617526404552 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1613895887296108390} - 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: 1763679349029880885} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &6606665980366896896 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1613895887296108390} - m_CullTransparentMesh: 1 ---- !u!114 &5549818488432535375 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1613895887296108390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e6d4c7d1a7fbe3a4a8b02aa76ee78da4, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2685204742582082395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1763679349029880885} - m_Layer: 5 - m_Name: Imaged instruction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1763679349029880885 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2685204742582082395} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8508122244990994089} - - {fileID: 7766316617526404552} - - {fileID: 5170193276244579229} - - {fileID: 4356760564044931592} - m_Father: {fileID: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -290.51, y: -30.7} - m_SizeDelta: {x: 97.2, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6555478355352572726 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8508122244990994089} - - component: {fileID: 126549014573244485} - - component: {fileID: 7296744992790646822} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8508122244990994089 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6555478355352572726} - 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: 1763679349029880885} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &126549014573244485 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6555478355352572726} - m_CullTransparentMesh: 1 ---- !u!114 &7296744992790646822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6555478355352572726} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a640cc94f9689af4bbf5ca46685dfd85, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7009698519706137673 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5170193276244579229} - - component: {fileID: 588599641765385521} - - component: {fileID: 3811302068302343475} - m_Layer: 5 - m_Name: plus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5170193276244579229 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7009698519706137673} - 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: 1763679349029880885} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 28, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &588599641765385521 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7009698519706137673} - m_CullTransparentMesh: 1 ---- !u!114 &3811302068302343475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7009698519706137673} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: + - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: FastCheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - - {fileID: 1763679349029880885} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7598453025099678184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4356760564044931592} - - component: {fileID: 3445636509480421493} - - component: {fileID: 4782541499963616774} - m_Layer: 5 - m_Name: Text (TMP).1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4356760564044931592 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7598453025099678184} - 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: 1763679349029880885} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -9.07, y: 0} - m_SizeDelta: {x: 55.42, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &3445636509480421493 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7598453025099678184} - m_CullTransparentMesh: 1 ---- !u!114 &4782541499963616774 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7598453025099678184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "(3 \u0441\u0435\u043A.)" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab.meta deleted file mode 100644 index 8780428..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheck.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 268cd97e18313524992fcd3ee6aa89f8 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab deleted file mode 100644 index 163d6c8..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab +++ /dev/null @@ -1,179 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0414\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 \u0432\u044B\u0432\u043E\u0434 - \u043E\u0441\u0442\u0430\u0442\u043A\u0430 \u043F\u0440\u0438\u0437\u043E\u0432 - \u043D\u0430 \u043F\u0430\u043D\u0435\u043B\u044C \u0431\u044B\u0441\u0442\u0440\u043E\u0439 - \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u043E\u0432\n- - \u0420\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u0442\u043E\u043B\u044C\u043A\u043E - \u0435\u0441\u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 - \u0411\u044B\u0441\u0442\u0440\u0430\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 - \u0441\u0447\u0435\u0442\u0447\u0438\u043A\u043E\u0432 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: FastCheckPrizes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab.meta deleted file mode 100644 index f1585ad..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/FastCheckPrizes.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f350d6a998ae46344bcd65a2bcb6eb3a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab deleted file mode 100644 index 886327c..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab +++ /dev/null @@ -1,180 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0415\u0441\u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 - \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430, \u0430\u043F\u043F\u0430\u0440\u0430\u0442 - \u043F\u0435\u0440\u0435\u0445\u043E\u0434\u0438\u0442 \u0432 \u0431\u0435\u0441\u043F\u043B\u0430\u0442\u043D\u044B\u0439 - \u0440\u0435\u0436\u0438\u043C.\n- \u0421\u043A\u0440\u044B\u0432\u0430\u0435\u0442\u0441\u044F:\n\t1. - \u0421\u0447\u0435\u0442\u0447\u0438\u043A \u043C\u043E\u043D\u0435\u0442;\n\t2. - \u0426\u0435\u043D\u044B \u0438\u0433\u0440\u044B \u0441 \u0431\u043E\u0442\u043E\u043C, - \u043D\u0430 \u0434\u0432\u043E\u0438\u0445 \u0438 \u0446\u0435\u043D\u0430 \u0440\u0435\u0432\u0430\u043D\u0448\u0430;\n\t3. - \u0426\u0435\u043D\u0430 \u043C\u043E\u043D\u0435\u0442\u044B \u0432\u0433\u043B\u0430\u0432\u043D\u043E\u043C - \u043C\u0435\u043D\u044E." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -18.83 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: Freeplay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab.meta deleted file mode 100644 index 8a15621..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Freeplay.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f601ae0d27a2e534cb3b7e1811f2c954 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab deleted file mode 100644 index 8cd9fa2..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab +++ /dev/null @@ -1,175 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0418\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C - \u043C\u0443\u0437\u044B\u043A\u0438 \u0432 \u0438\u0433\u0440\u0435\n- \u0418\u0437\u043C\u0435\u043D\u044F\u0435\u0442 - \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u0432\u0438\u0434\u0435\u043E\u0440\u043E\u043B\u0438\u043A\u043E\u0432 - (\u043F\u0440\u043E\u043C\u043E, \u043F\u043E\u0431\u0435\u0434\u043D\u044B\u0439)" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: MusicVolume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab.meta deleted file mode 100644 index f768b50..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/MusicVolume.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7aa8f09ebc2045745b7cf6f501a0b998 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab deleted file mode 100644 index f917730..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab +++ /dev/null @@ -1,178 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "-\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C - \u043D\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438. \u041F\u0440\u0438 - \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442\u0441\u044F - \u043F\u0430\u043D\u0435\u043B\u044C \u0432\u0432\u043E\u0434\u0430 \u043F\u0430\u0440\u043E\u043B\u044F. - \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438 \u0437\u0430\u043F\u043E\u043C\u043D\u0438\u0442\u0435.\n-\u041F\u0440\u0438 - \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0438 \u043F\u0430\u0440\u043E\u043B\u044C - \u043E\u0447\u0438\u0449\u0430\u0435\u0442\u0441\u044F." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: PasswordOnSettings - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab.meta deleted file mode 100644 index 971f700..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PasswordOnSettings.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2fd63316851eaa84d9771255e07e69cf -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab deleted file mode 100644 index ab1a488..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab +++ /dev/null @@ -1,186 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0412\u043A\u043B\u044E\u0447\u0430\u0435\u0442/\u0412\u044B\u043A\u043B\u044E\u0447\u0430\u0435\u0442 - \u0432\u044B\u0434\u0430\u0447\u0443 \u043F\u0440\u0438\u0437\u0430 \u0441 \u0445\u043E\u043F\u043F\u0435\u0440\u0430.\n- - \u0415\u0441\u043B\u0438 \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043E - \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\u043C \u043C\u0435\u043D\u044E \u043D\u0435 - \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442\u0441\u044F \u043D\u0430\u0434\u043F\u0438\u0441\u0438:\n\t- - \"\u0438\u0433\u0440\u0430 \u043D\u0430 \u043F\u0440\u0438\u0437\"; \"\u0431\u0435\u0437 - \u043F\u0440\u0438\u0437\u0430\"; \"\u043C\u0430\u043B\u0435\u043D\u044C\u043A\u0438\u0435 - \u043F\u0440\u0438\u0437\u044B \u0437\u0430\u043A\u043E\u043D\u0447\u0438\u043B\u0438\u0441\u044C\" - (\u044D\u0442\u0443 \u043D\u0430\u0434\u043F\u0438\u0441\u044C \u043C\u043E\u0436\u043D\u043E - \u0443\u0432\u0438\u0434\u0435\u0442\u044C \u0435\u0441\u043B\u0438 \u043E\u0441\u0442\u0430\u0442\u043E\u043A - \u043F\u0440\u0438\u0437\u043E\u0432 = 0);\n\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435! - \u0415\u0441\u043B\u0438 \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C - \u044D\u0442\u0443 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0443, \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 - <\u0422\u0435\u0441\u0442 \u0445\u043E\u043F\u043F\u0435\u0440\u0430> - \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18.85 - m_fontSizeBase: 18.85 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: Prizing - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab.meta deleted file mode 100644 index 4f8b970..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/Prizing.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6036e21e2d40e2849acf16ca0457e81c -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab deleted file mode 100644 index c6a095e..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab +++ /dev/null @@ -1,183 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0431\u0443\u0434\u0435\u0442 - \u043B\u0438 \u0430\u043F\u043F\u0430\u0440\u0430\u0442 \u043F\u044B\u0442\u0430\u0442\u044C\u0441\u044F - \u0432\u044B\u0434\u0430\u0442\u044C \u043F\u0440\u0438\u0437 \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 - \u0440\u0430\u0437, \u0435\u0441\u043B\u0438 \u0430\u043F\u043F\u0430\u0440\u0430\u0442 - \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0438 - \u043E\u0448\u0431\u043A\u0438 \u0432\u044B\u0434\u0430\u0447\u0438 (\u0433\u043E\u0440\u0438\u0442 - \u043D\u0430\u0434\u043F\u0438\u0441\u044C \"\u043E\u0448\u0438\u0431\u043A\u0430 - \u0432\u044B\u0434\u0430\u0447\u0438\")\n\n- \u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C - \u043E\u0448\u0438\u0431\u043A\u0443 \u043C\u043E\u0436\u043D\u043E \u0432 \u043C\u0435\u043D\u044E, - \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0432 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 - <\u0421\u0431\u0440\u043E\u0441 \u043E\u0448\u0438\u0431\u043A\u0438 - \u0432\u044B\u0434\u0430\u0447\u0438> \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -11.28 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: PrizingWhenError - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab.meta deleted file mode 100644 index 9dd53a7..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PrizingWhenError.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d3bf91c9f11c4b5419d1e93443715fd9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab deleted file mode 100644 index a8a42f9..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab +++ /dev/null @@ -1,173 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0418\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C - \u043F\u0440\u043E\u043C\u043E\u0440\u043E\u043B\u0438\u043A\u0430" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: PromoVolume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab.meta deleted file mode 100644 index a593474..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/PromoVolume.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 20804b36a3f36e54588502fc0e16c610 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab deleted file mode 100644 index 7833f31..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab +++ /dev/null @@ -1,178 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0431\u0443\u0434\u0435\u0442 - \u043B\u0438 \u0432\u044B\u0432\u0435\u0434\u0435\u043D \u043D\u043E\u043C\u0435\u0440 - \u0442\u0435\u043B\u0435\u0444\u043E\u043D\u0430 \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\u043C - \u043C\u0435\u043D\u044E.\n- \u041D\u043E\u043C\u0435\u0440 \u0432\u044B\u0432\u043E\u0434\u0438\u0442\u0441\u044F - \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\u043C \u043C\u0435\u043D\u044E \u0441\u043D\u0438\u0437\u0443. - \u041F\u043E\u0434\u043F\u0438\u0441\u0430\u043D \u043A\u0430\u043A \"\u0442\u0435\u0445. - \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430\"." - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: ShowNumber - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab.meta deleted file mode 100644 index 14fb4eb..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/ShowNumber.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d741d2a4aa662264f8d7406c20150822 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab deleted file mode 100644 index 759b4e0..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab +++ /dev/null @@ -1,177 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "- \u0418\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C - \u0437\u0432\u0443\u043A\u043E\u0432\u044B\u0445 \u044D\u0444\u0444\u0435\u043A\u0442\u043E\u0432 - \u0432 \u0438\u0433\u0440\u0435\n- \u0418\u0437\u043C\u0435\u043D\u044F\u0435\u0442 - \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u0432\u0441\u0435\u0445 - \u0437\u0432\u0443\u043A\u043E\u0432, \u043A\u0440\u043E\u043C\u0435 \u0432\u0438\u0434\u0435\u043E\u0440\u043E\u043B\u0438\u043A\u043E\u0432 - \u0438 \u043C\u0443\u0437\u044B\u043A\u0438" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: SoundsVolume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab.meta deleted file mode 100644 index 2089ac1..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/SoundsVolume.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: beae4e18f4e06a8449964dede31fc838 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab b/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab deleted file mode 100644 index 3528070..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab +++ /dev/null @@ -1,181 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4641018153116856876 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - 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: 4639762839304224986} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u0415\u0441\u043B\u0438 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430: - \u041F\u0435\u0440\u0435\u0434 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435\u043C - \u043F\u0440\u0438\u0437\u0430 \u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u0442 - \"\u0417\u0430\u0431\u0440\u0430\u0442\u044C \u043F\u0440\u0438\u0437 \u0438 - \u0432\u044B\u0439\u0442\u0438 \u0438\u043B\u0438 \u0438\u0433\u0440\u0430\u0442\u044C - \u0434\u0430\u043B\u044C\u0448\u0435?\". \u0414\u043B\u044F \u044D\u043A\u043E\u043D\u043E\u043C\u0438\u0438 - \u043F\u0440\u0438\u0437\u043E\u0432.\n\n\u0415\u0441\u043B\u0438 \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u0430: - \u0410\u043F\u043F\u0430\u0440\u0430\u0442 \u0432\u044B\u0434\u0430\u0435\u0442 - \u0432\u0441\u0435 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044B\u0435 - \u043D\u0430 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435\u0439 \u043F\u0440\u0438\u0437\u044B" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -18.83 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: TakeOrRisk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 160} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab.meta b/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab.meta deleted file mode 100644 index 5d6b984..0000000 --- a/Assets/Scripts/Settings/Descriptions/Settings descriptions/TakeOrRisk.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9d5393e2c374c6a49adf05d484f89bae -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/DifficultyView.cs b/Assets/Scripts/Settings/DifficultyView.cs deleted file mode 100644 index d2c0030..0000000 --- a/Assets/Scripts/Settings/DifficultyView.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.Text; -using TMPro; -using UnityEngine; - -public class DifficultyView : MonoBehaviour -{ - public TextMeshProUGUI label; - StringBuilder sb; - private void OnEnable() - { - SettingsManager.OnSettingsChanged.AddListener(RefreshView); - PaymentSystem.onCoinAdded += RefreshView; - sb = new StringBuilder(); - RefreshView(); - } - private void OnDisable() - { - SettingsManager.OnSettingsChanged.RemoveListener(RefreshView); - PaymentSystem.onCoinAdded -= RefreshView; - } - - private void RefreshView() - { - sb.Clear(); - string difficultyType = SettingsManager.GetString("BaseBotDifficulty", "Обычная"); - switch (difficultyType) - { - case "Обычная": - SetNormalDificultyView(); break; - case "Повышенная": - SetUpgradedDificultyView(); break; - case "Фиксированная": - SetFixedDificultyView(); break; - } - - } - private void RefreshView(int newCount) => RefreshView(); - - - private void SetNormalDificultyView() - { - sb.AppendLine("-Обычная. "); - sb.AppendLine("-После победы над боссом сложность станет повышенной. "); - sb.AppendLine($"-Текущая сложность ботов: {SettingsManager.GetString("Difficulty", "?")}."); - sb.AppendLine("-Сейчас босс ходит вторым, что повышает шанс игрока на победу."); - - label.text = sb.ToString(); - - } - private void SetUpgradedDificultyView() - { - int pulses = PaymentSystem.PulsesCounter; - int pulsesToReset = PlayerPrefs.GetInt("PulsesToResetDifficulty", 0); - - sb.AppendLine("-Повышенная. "); - sb.AppendLine($"-Счетчик импульсов: {pulses}/{pulsesToReset}. "); - sb.AppendLine($"-Текущая сложность ботов: Сложная."); - sb.AppendLine($"-Сложность понизится через: {pulsesToReset - pulses} импульсов. "); - sb.AppendLine("-Сейчас босс ходит первым, что понижает шанс игрока на победу."); - - label.text = sb.ToString(); - - - ///ТУТ НАДО БРАТЬ МАКСИМАЛЬНУЮ НАПРИМЕР ИЗ МЕНЕДЖЕРА СЛОЖНОСТЕЙ - } - private void SetFixedDificultyView() - { - sb.AppendLine("-Фиксированная. "); - sb.AppendLine($"-Текущая сложность ботов: {SettingsManager.GetString("Difficulty", "?")}."); - sb.AppendLine("-Сложность берется из настройки \"Сложность ботов\" и не меняется в зависимости от монет и счетчика импульсов."); - sb.AppendLine("-Босс ходит первым."); - - label.text = sb.ToString(); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/DifficultyView.cs.meta b/Assets/Scripts/Settings/DifficultyView.cs.meta deleted file mode 100644 index 27875fa..0000000 --- a/Assets/Scripts/Settings/DifficultyView.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 86b7d5bfd360a9f49a1e020d85361b28 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Editor.meta b/Assets/Scripts/Settings/Editor.meta new file mode 100644 index 0000000..a7640f4 --- /dev/null +++ b/Assets/Scripts/Settings/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04f09236e8d998043945345ddf791045 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/Editor/SettingEditor.cs b/Assets/Scripts/Settings/Editor/SettingEditor.cs new file mode 100644 index 0000000..6d8f2ff --- /dev/null +++ b/Assets/Scripts/Settings/Editor/SettingEditor.cs @@ -0,0 +1,143 @@ +using UnityEditor; +using UnityEngine; + +[CustomEditor(typeof(Setting))] +public class SettingEditor : Editor +{ + private SerializedProperty typeProperty; + private SerializedProperty idProperty; + private SerializedProperty aliasProperty; + private SerializedProperty descriptionProperty; + + // Bool fields + private SerializedProperty boolValueProperty; + + // Int fields + private SerializedProperty intValueProperty; + private SerializedProperty intMinProperty; + private SerializedProperty intMaxProperty; + private SerializedProperty intStepProperty; + + // Float fields + private SerializedProperty floatValueProperty; + private SerializedProperty floatMinProperty; + private SerializedProperty floatMaxProperty; + private SerializedProperty floatStepProperty; + + // String fields + private SerializedProperty stringValueProperty; + private SerializedProperty allowedValuesProperty; + + //Signal fields + private SerializedProperty signalProperty; + + + private void OnEnable() + { + // General fields + typeProperty = serializedObject.FindProperty("Type"); + idProperty = serializedObject.FindProperty("Id"); + aliasProperty = serializedObject.FindProperty("Alias"); + descriptionProperty = serializedObject.FindProperty("Description"); + + // Bool fields + boolValueProperty = serializedObject.FindProperty("BoolValue"); + + // Int fields + intValueProperty = serializedObject.FindProperty("IntValue"); + intMinProperty = serializedObject.FindProperty("IntMin"); + intMaxProperty = serializedObject.FindProperty("IntMax"); + intStepProperty = serializedObject.FindProperty("IntStep"); + + // Float fields + floatValueProperty = serializedObject.FindProperty("FloatValue"); + floatMinProperty = serializedObject.FindProperty("FloatMin"); + floatMaxProperty = serializedObject.FindProperty("FloatMax"); + floatStepProperty = serializedObject.FindProperty("FloatStep"); + + // String fields + stringValueProperty = serializedObject.FindProperty("StringValue"); + allowedValuesProperty = serializedObject.FindProperty("AllowedValues"); + + //Signal fields + signalProperty = serializedObject.FindProperty("SignalValue"); + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + // Draw General fields (always visible) + EditorGUILayout.LabelField("General", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(typeProperty); + EditorGUILayout.PropertyField(idProperty); + EditorGUILayout.PropertyField(aliasProperty); + EditorGUILayout.PropertyField(descriptionProperty); + + EditorGUILayout.Space(5); + + // Draw type-specific fields + Setting.SettingType currentType = (Setting.SettingType)typeProperty.enumValueIndex; + + switch (currentType) + { + case Setting.SettingType.Bool: + EditorGUILayout.LabelField("Bool Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(boolValueProperty); + break; + + case Setting.SettingType.Int: + EditorGUILayout.LabelField("Int Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(intValueProperty); + EditorGUILayout.PropertyField(intMinProperty); + EditorGUILayout.PropertyField(intMaxProperty); + EditorGUILayout.PropertyField(intStepProperty); + break; + + case Setting.SettingType.Float: + EditorGUILayout.LabelField("Float Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(floatValueProperty); + EditorGUILayout.PropertyField(floatMinProperty); + EditorGUILayout.PropertyField(floatMaxProperty); + EditorGUILayout.PropertyField(floatStepProperty); + break; + + case Setting.SettingType.String: + EditorGUILayout.LabelField("String Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(stringValueProperty); + EditorGUILayout.PropertyField(allowedValuesProperty); + break; + case Setting.SettingType.Signal: + EditorGUILayout.LabelField("Signal Settings", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(signalProperty); + break; + } + + serializedObject.ApplyModifiedProperties(); + + // Add validation for Int and Float values + ValidateValues(); + } + + private void ValidateValues() + { + Setting setting = (Setting)target; + + if (setting.Type == Setting.SettingType.Int) + { + // Clamp IntValue between min and max + if (setting.IntValue < setting.IntMin) + setting.IntValue = setting.IntMin; + if (setting.IntValue > setting.IntMax) + setting.IntValue = setting.IntMax; + } + else if (setting.Type == Setting.SettingType.Float) + { + // Clamp FloatValue between min and max + if (setting.FloatValue < setting.FloatMin) + setting.FloatValue = setting.FloatMin; + if (setting.FloatValue > setting.FloatMax) + setting.FloatValue = setting.FloatMax; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Editor/SettingEditor.cs.meta b/Assets/Scripts/Settings/Editor/SettingEditor.cs.meta new file mode 100644 index 0000000..e5a87a8 --- /dev/null +++ b/Assets/Scripts/Settings/Editor/SettingEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e5c0a0bd0dd14ce45bf6eda3e047b372 \ No newline at end of file diff --git a/Assets/Scripts/Settings/EnterPasswordPanel.cs b/Assets/Scripts/Settings/EnterPasswordPanel.cs deleted file mode 100644 index c235fa0..0000000 --- a/Assets/Scripts/Settings/EnterPasswordPanel.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class EnterPasswordPanel : MonoBehaviour -{ - int enteredSymbols = 0; - int SymbolsCount = 6; - - public AudioClip trueSound; - public AudioClip falseSound; - - public AnimationCurve fillCurve; - - float clearTimer = 0; - public Image ClearImage; - - float exitTimer = 0; - public Image ExitImage; - - public string symbols = ""; - - public List slots; - public GameObject L1; - public GameObject L2; - public GameObject R1; - public GameObject R2; - public GameObject D1; - public GameObject D2; - private List spawnedObjs = new(); - - public bool truePassword = false; - private string password; - - List availableButtons = new List - { - ButtonPinMapping.left1, - ButtonPinMapping.left2, - ButtonPinMapping.right1, - ButtonPinMapping.right2, - ButtonPinMapping.down1, - ButtonPinMapping.down2, - }; - - public void Initialize(string password) - { - truePassword = false; - this.password = password; - } - - public void _Update() - { - //p2 очистить - ClearProcess(); - ExitProcess(); - - //получить комбинацию по кнопке - ButtonsProcess(); - } - - void ClearProcess() - { - - if (In.GetButton(ButtonPinMapping.startTwoPlayers)) clearTimer += Time.deltaTime; - else clearTimer -= Time.deltaTime; - clearTimer = Mathf.Clamp(clearTimer, 0.0f, 2.0f); - ProcessImageTimer(ClearImage, clearTimer, 2); - - if (clearTimer == 2) - { - clearTimer = 0.0f; - Clear(); - } - - } - private void Clear() - { - clearTimer = 0; - exitTimer = 0; - enteredSymbols = 0; - symbols = string.Empty; - - foreach (var go in spawnedObjs) - { - Destroy(go); - } - spawnedObjs.Clear(); - } - - private void ExitProcess() - { - if (In.GetButton(ButtonPinMapping.startOnePlayer)) exitTimer += Time.deltaTime; - else exitTimer -= Time.deltaTime; - exitTimer = Mathf.Clamp(exitTimer, 0.0f, 2.0f); - ProcessImageTimer(ExitImage, exitTimer, 2); - - if (exitTimer == 2) - { - Clear(); - GameManager.instance.stateMachine.ChangeState(new MenuState()); - } - } - - - void ButtonsProcess() - { - if (enteredSymbols >= SymbolsCount) return; - - foreach (ButtonPinMapping button in availableButtons) - { - if (In.GetButtonDown(button)) - { - string combinationStr = GetStrCombination(button); - symbols+=combinationStr; - DisplaySymbol(combinationStr); - enteredSymbols++; - - break; - } - } - - - if(enteredSymbols == SymbolsCount) - { - if(symbols == password) - { - truePassword = true; - SoundManager.instance.playClip(trueSound); - } - else - { - truePassword = false; - SoundManager.instance.playClip(falseSound); - } - Clear(); - - //введи все символы надо проверка - } - - } - - void DisplaySymbol(string symbol) - { - GameObject prefab = symbol switch - { - "L1" => L1, - "L2" => L2, - "R1" => R1, - "R2" => R2, - "A1" => D1, - "A2" => D2, - _ => L1 - }; - - GameObject spawned = Instantiate(prefab, slots[enteredSymbols]); - spawnedObjs.Add(spawned); - } - - string GetStrCombination(ButtonPinMapping button) - => button switch - { - ButtonPinMapping.left1 => "L1", - ButtonPinMapping.left2 => "L2", - ButtonPinMapping.right1 => "R1", - ButtonPinMapping.right2 => "R2", - ButtonPinMapping.down1 => "A1", - ButtonPinMapping.down2 => "A2", - _ => null - }; - - - void ProcessImageTimer(Image image, float time, float maxtime) - => image.fillAmount = fillCurve.Evaluate(time / maxtime); -} diff --git a/Assets/Scripts/Settings/EnterPasswordPanel.cs.meta b/Assets/Scripts/Settings/EnterPasswordPanel.cs.meta deleted file mode 100644 index 82c63a5..0000000 --- a/Assets/Scripts/Settings/EnterPasswordPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e0e91130ffc40c34bbf557582d2ce828 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs b/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs deleted file mode 100644 index 5b4db5e..0000000 --- a/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ExitPulseToResetPanelHandler : MonoBehaviour -{ - private void OnDisable() => GameManager.instance.ProcessDifficultyCounter(); -} diff --git a/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs.meta b/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs.meta deleted file mode 100644 index 8c0b64e..0000000 --- a/Assets/Scripts/Settings/ExitPulseToResetPanelHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 47a33fadb3b3c8443879b1887024e089 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/HeaderIconsProvider.cs b/Assets/Scripts/Settings/HeaderIconsProvider.cs deleted file mode 100644 index 5924b3d..0000000 --- a/Assets/Scripts/Settings/HeaderIconsProvider.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class HeaderIconsProvider : MonoBehaviour -{ - public List Icons; - public GameObject defaultIcon; - - public GameObject GetIcon(string header) - { - //Проверки заполнения - if (Icons == null) - { - Debug.LogError("Не заданы иконки"); return null; - } - if (defaultIcon == null) - { - Debug.LogError("Не задана иконка по умолчанию"); return null; - } - - //поиск по id - GameObject foundIcon = null; - for (int i = 0; i < Icons.Count; i++) - { - if (Icons[i].Name == header) - { - foundIcon = Icons[i].IconPrefab; - break; - } - } - - //возврат - if (foundIcon == null) - { - Debug.LogError($"Иконка с id: {header} не найдено. Возврат дефолтного значения"); - return defaultIcon; - } - return foundIcon; - } - - - [Serializable] - public class HeaderIcon - { - public string Name; - public GameObject IconPrefab; - } -} diff --git a/Assets/Scripts/Settings/HeaderIconsProvider.cs.meta b/Assets/Scripts/Settings/HeaderIconsProvider.cs.meta deleted file mode 100644 index 1ffed2d..0000000 --- a/Assets/Scripts/Settings/HeaderIconsProvider.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a4a365d22d377df438859fe56810e82e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/HeaderPrefab.prefab b/Assets/Scripts/Settings/HeaderPrefab.prefab deleted file mode 100644 index d44ead8..0000000 --- a/Assets/Scripts/Settings/HeaderPrefab.prefab +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: 8886594288047508638} - m_Layer: 5 - m_Name: HeaderPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 550, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &8886594288047508638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u043F\u0440\u0435\u0444\u0430\u0431\n" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 4 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/HeaderPrefab.prefab.meta b/Assets/Scripts/Settings/HeaderPrefab.prefab.meta deleted file mode 100644 index 84a9ae7..0000000 --- a/Assets/Scripts/Settings/HeaderPrefab.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d3327260e36e5944d8a903656f4fb764 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/ICompletable.cs b/Assets/Scripts/Settings/ICompletable.cs new file mode 100644 index 0000000..3d3e5e1 --- /dev/null +++ b/Assets/Scripts/Settings/ICompletable.cs @@ -0,0 +1,6 @@ +using System; + +public interface ICompletable +{ + public event Action OnComplete; +} diff --git a/Assets/Scripts/Settings/ICompletable.cs.meta b/Assets/Scripts/Settings/ICompletable.cs.meta new file mode 100644 index 0000000..f1948db --- /dev/null +++ b/Assets/Scripts/Settings/ICompletable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 71eafdf3d47f6194a955313b104b3c67 \ No newline at end of file diff --git a/Assets/Scripts/Settings/ImageBlinker.cs b/Assets/Scripts/Settings/ImageBlinker.cs new file mode 100644 index 0000000..1bd405d --- /dev/null +++ b/Assets/Scripts/Settings/ImageBlinker.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent (typeof(Graphic))] +public class ImageBlinker : MonoBehaviour +{ + [SerializeField] private float speed = 7; + [SerializeField] private float minAlpha = 0.1f; + [SerializeField] private float maxAlpha = 0.3f; + + private Graphic graphic; + private Color originalColor; + void Start() + { + graphic = GetComponent(); + originalColor = graphic.color; + } + + void Update() + { + float sinValue = Mathf.Sin(Time.time * speed); + + float alpha = Remap(sinValue, -1f, 1f, minAlpha, maxAlpha); + + Color color = originalColor; + color.a = alpha; + graphic.color = color; + } + + float Remap(float value, float fromMin, float fromMax, float toMin, float toMax) + { + return toMin + (value - fromMin) * (toMax - toMin) / (fromMax - fromMin); + } +} diff --git a/Assets/Scripts/Settings/ImageBlinker.cs.meta b/Assets/Scripts/Settings/ImageBlinker.cs.meta new file mode 100644 index 0000000..9de4ad8 --- /dev/null +++ b/Assets/Scripts/Settings/ImageBlinker.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 040cc05a4354dc54997280e49277678f \ No newline at end of file diff --git a/Assets/Scripts/Settings/ImageBlinkerCurved.cs b/Assets/Scripts/Settings/ImageBlinkerCurved.cs new file mode 100644 index 0000000..c1f9921 --- /dev/null +++ b/Assets/Scripts/Settings/ImageBlinkerCurved.cs @@ -0,0 +1,37 @@ +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent (typeof(Graphic))] +public class ImageBlinkerCurved : MonoBehaviour +{ + [SerializeField] private float speed = 7; + [SerializeField] private float minAlpha = 0.1f; + [SerializeField] private float maxAlpha = 0.3f; + + [SerializeField] private AnimationCurve curve; + + private Graphic graphic; + private Color originalColor; + void Start() + { + graphic = GetComponent(); + originalColor = graphic.color; + } + + void Update() + { + float sinValue = Mathf.Sin(Time.time * speed); + + float alpha = Remap(sinValue, -1f, 1f, minAlpha, maxAlpha); + alpha = curve.Evaluate(alpha); + + Color color = originalColor; + color.a = alpha; + graphic.color = color; + } + + float Remap(float value, float fromMin, float fromMax, float toMin, float toMax) + { + return toMin + (value - fromMin) * (toMax - toMin) / (fromMax - fromMin); + } +} diff --git a/Assets/Scripts/Settings/ImageBlinkerCurved.cs.meta b/Assets/Scripts/Settings/ImageBlinkerCurved.cs.meta new file mode 100644 index 0000000..ce4a851 --- /dev/null +++ b/Assets/Scripts/Settings/ImageBlinkerCurved.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 53b090029497db44189a1e5a3eb48cc1 diff --git a/Assets/Scripts/Settings/IoTestPanel.cs b/Assets/Scripts/Settings/IoTestPanel.cs deleted file mode 100644 index af04f7b..0000000 --- a/Assets/Scripts/Settings/IoTestPanel.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class IoTestPanel : MonoBehaviour -{ - [SerializeField] List wowSounds; - private float timer = 0; - - [SerializeField] RectTransform pipeline; - [SerializeField] List buttonTesters; - private int currentTesterIndex = 0; - - private float exitTime = 3f; - [SerializeField] Image ExitImage; - - private Vector2 velocity = Vector2.zero; - - private void OnEnable() - { - foreach (var tester in buttonTesters) { tester.active = false; } - - pipeline.anchoredPosition = Vector2.zero; - currentTesterIndex = 0; - buttonTesters[currentTesterIndex].active = true; - } - - void Update() - { - ExitProcessing(); - - ButtonPinMapping buttonToPress = buttonTesters[currentTesterIndex].button; - if (In.GetButton(buttonToPress)) - { - buttonTesters[currentTesterIndex].EmulatePress(); - SoundManager.instance.playClip(wowSounds[Random.Range(0, wowSounds.Count)]); - buttonTesters[currentTesterIndex].active = false; - - currentTesterIndex = (currentTesterIndex + 1 + buttonTesters.Count) % buttonTesters.Count; - buttonTesters[currentTesterIndex].active = true; - } - - Vector2 target = new Vector2(200 * currentTesterIndex, 0); - pipeline.anchoredPosition = Vector2.SmoothDamp( - pipeline.anchoredPosition, - target, - ref velocity, - 0.3f - ); - } - - private void ExitProcessing() - { - bool pressedExit = In.GetButton(ButtonPinMapping.startOnePlayer) && In.GetButton(ButtonPinMapping.startTwoPlayers); - timer += pressedExit ? Time.deltaTime : -3 * Time.deltaTime; - timer = Mathf.Clamp(timer, 0, exitTime); - - float fillAmount = timer / exitTime; - ExitImage.fillAmount = fillAmount; - - if (timer >= 3) - { - GameManager.instance.stateMachine.ChangeState(new SettingsState()); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/IoTestPanel.cs.meta b/Assets/Scripts/Settings/IoTestPanel.cs.meta deleted file mode 100644 index fc89bf0..0000000 --- a/Assets/Scripts/Settings/IoTestPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7a0d162bc3bcb184c85f6868a91ec25d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/LetterSlot.cs b/Assets/Scripts/Settings/LetterSlot.cs new file mode 100644 index 0000000..8609b97 --- /dev/null +++ b/Assets/Scripts/Settings/LetterSlot.cs @@ -0,0 +1,81 @@ +using TMPro; +using UnityEngine; +using Cysharp.Threading.Tasks; +using System.Threading; +using UnityEngine.UI; + +public class LetterSlot : MonoBehaviour +{ + [SerializeField] private TextMeshProUGUI _label; + + [Header("Анимация выбора")] + [SerializeField] private float _normalScale = 1f; + [SerializeField] private float _selectedScale = 1.1f; + [SerializeField] private float _animationSpeed = 5f; + + [SerializeField] private Color normalColor; + [SerializeField] private Color selectedColor; + + [SerializeField] private AnimationCurve _animationCurve; + + private char _symbol; + private Color _cachedColor; + private CancellationTokenSource _cts; + + public void Init(char symbol, bool selected) + { + SetSymbol(symbol); + SetSelected(selected); + } + + public void SetSelected(bool value) + { + _cts?.Cancel(); + _cts?.Dispose(); + _cts = new CancellationTokenSource(); + + AnimAsync(selected: value, _cts.Token).Forget(); + } + + public char GetSymbol() => _symbol; + + public void SetSymbol(char symbol) + { + _symbol = symbol; + UpdateLabel(); + } + + private void UpdateLabel() => _label.text = _symbol.ToString(); + + private async UniTask AnimAsync(bool selected, CancellationToken token) + { + Color startColor = _label.color; + float startScale = transform.localScale.x; + + Color targetColor = selected ? selectedColor : normalColor; + float targetScale = selected ? _selectedScale : _normalScale; + + float t = 0; + while (t < 1f && !token.IsCancellationRequested) + { + float t1 = _animationCurve.Evaluate(t); + + transform.localScale = Vector3.one * Mathf.Lerp(startScale, targetScale, t1); + _label.color = Color.Lerp(startColor, targetColor, t1); + + t += Time.deltaTime * _animationSpeed; + t = Mathf.Min(t, 1f); + + await UniTask.Yield(PlayerLoopTiming.Update, token); + } + + transform.localScale = Vector3.one * targetScale; + _label.color = targetColor; + } + + private void OnDestroy() + { + _cts?.Cancel(); + _cts?.Dispose(); + } +} diff --git a/Assets/Scripts/Settings/LetterSlot.cs.meta b/Assets/Scripts/Settings/LetterSlot.cs.meta new file mode 100644 index 0000000..80857f0 --- /dev/null +++ b/Assets/Scripts/Settings/LetterSlot.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5564bebfca6320f44825c91d7fb285bc \ No newline at end of file diff --git a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab b/Assets/Scripts/Settings/LetterSlot.prefab similarity index 58% rename from Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab rename to Assets/Scripts/Settings/LetterSlot.prefab index e730d26..12aa735 100644 --- a/Assets/Scripts/Settings/Descriptions/Actions descriptions/Тест экрана.prefab +++ b/Assets/Scripts/Settings/LetterSlot.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &334621903248152329 +--- !u!1 &6701869724969323775 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,98 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4641018153116856876} - - component: {fileID: 7974557143938056251} - - component: {fileID: 3186854818972227115} - - component: {fileID: 2828732964538913965} + - component: {fileID: 4847867788462534487} + - component: {fileID: 6526978814707206463} + - component: {fileID: 8162617034424080788} + m_Layer: 5 + m_Name: LetterSlot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4847867788462534487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6701869724969323775} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5891667563034517819} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6526978814707206463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6701869724969323775} + m_CullTransparentMesh: 1 +--- !u!114 &8162617034424080788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6701869724969323775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5564bebfca6320f44825c91d7fb285bc, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::LetterSlot + _label: {fileID: 3629931500767060217} + _image: {fileID: 0} + _normalScale: 1 + _selectedScale: 1.1 + _animationSpeed: 10 + normalColor: {r: 0, g: 0.8117648, b: 0, a: 0.39215687} + selectedColor: {r: 0, g: 0.8117648, b: 0, a: 1} + _animationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &7571868062296136469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5891667563034517819} + - component: {fileID: 2984474571579231236} + - component: {fileID: 3629931500767060217} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -19,45 +107,45 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4641018153116856876 +--- !u!224 &5891667563034517819 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} + m_GameObject: {fileID: 7571868062296136469} 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: 4639762839304224986} + m_Father: {fileID: 4847867788462534487} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7974557143938056251 + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2984474571579231236 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} + m_GameObject: {fileID: 7571868062296136469} m_CullTransparentMesh: 1 ---- !u!114 &3186854818972227115 +--- !u!114 &3629931500767060217 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} + m_GameObject: {fileID: 7571868062296136469} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -66,19 +154,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "- \u0417\u0430\u043F\u0443\u0441\u043A\u0430\u0435\u0442 \u0446\u0432\u0435\u0442\u043E\u0432\u0443\u044E - \u0430\u043D\u0438\u043C\u0430\u0446\u0438\u044E \u0434\u043B\u044F \u043E\u0446\u0435\u043D\u043A\u0438 - \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438." + m_text: 1 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} + m_fontAsset: {fileID: 11400000, guid: 78d51b7df98de9942a628b514c730b60, type: 2} + m_sharedMaterial: {fileID: 8799349529173042004, guid: 78d51b7df98de9942a628b514c730b60, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278243072 + m_fontColor: {r: 0, g: 0.8117648, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -95,31 +181,34 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 200 + m_fontSizeBase: 200 m_fontWeight: 400 m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 + m_fontSizeMin: 18 + m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -137,53 +226,3 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &2828732964538913965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334621903248152329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe8afb9103e17af46a5c2e5c211c3ff3, type: 3} - m_Name: - m_EditorClassIdentifier: - label: {fileID: 3186854818972227115} - speed: 0.5 ---- !u!1 &7265677761729542613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4639762839304224986} - m_Layer: 5 - m_Name: "\u0422\u0435\u0441\u0442 \u044D\u043A\u0440\u0430\u043D\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4639762839304224986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7265677761729542613} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4641018153116856876} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 820, y: 120} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Combinator/ComboLabel.prefab.meta b/Assets/Scripts/Settings/LetterSlot.prefab.meta similarity index 74% rename from Assets/Scripts/Settings/Combinator/ComboLabel.prefab.meta rename to Assets/Scripts/Settings/LetterSlot.prefab.meta index 823402e..89e0255 100644 --- a/Assets/Scripts/Settings/Combinator/ComboLabel.prefab.meta +++ b/Assets/Scripts/Settings/LetterSlot.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c19c294673e5fa429b9132908add8b6 +guid: 0b58754b4aeedff4f9eceafe35e9fff5 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Settings/Models.meta b/Assets/Scripts/Settings/Models.meta new file mode 100644 index 0000000..f232098 --- /dev/null +++ b/Assets/Scripts/Settings/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be20db47a6c534942a8bcbb3022f6ba1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/Models/Setting.cs b/Assets/Scripts/Settings/Models/Setting.cs new file mode 100644 index 0000000..64b3804 --- /dev/null +++ b/Assets/Scripts/Settings/Models/Setting.cs @@ -0,0 +1,201 @@ +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "Setting", menuName = "Создание настроек/Создать настройку"), System.Serializable] +public class Setting : ScriptableObject +{ + //general + [Header("General")] + public SettingType Type; + public string Id; + public string Alias; + [TextArea] public string Description; + + //type: Bool + public bool BoolValue; + + //type: Int + public int IntValue; + public int IntMin; + public int IntMax; + public int IntStep; + + //type: Float + public float FloatValue; + public float FloatMin; + public float FloatMax; + public float FloatStep; + + //type: String + public string StringValue; + public List AllowedValues; + + //type: Signal + public string SignalValue; + + + //Хэш не зависит от значения настройки. Иначе каждый раз будет перезагружать дефолтную схему + //Кроме сигнала. У него значение постоянно. + public string GetStringForHash() + { + string result = Id; + result += Alias; + result += Description; + + switch (Type) + { + case SettingType.Bool: + break; + case SettingType.Int: + result += IntMin + IntMax + IntStep; break; + case SettingType.Float: + result += FloatMin + FloatMax + FloatStep; break; + case SettingType.String: + foreach (string s in AllowedValues) result += s; break; + case SettingType.Signal: + result += SignalValue; break; + } + + return result; + } + + public SettingDTO GetDTO() + { + SettingDTO dto = new SettingDTO(); + + dto.Type = this.Type; + dto.Id = this.Id; + dto.Alias = this.Alias; + dto.Description = this.Description; + + // type: Bool + dto.BoolValue = this.BoolValue; + + // type: Int + dto.IntValue = this.IntValue; + dto.IntMin = this.IntMin; + dto.IntMax = this.IntMax; + dto.IntStep = this.IntStep; + + // type: Float + dto.FloatValue = this.FloatValue; + dto.FloatMin = this.FloatMin; + dto.FloatMax = this.FloatMax; + dto.FloatStep = this.FloatStep; + + // type: String + dto.StringValue = this.StringValue; + if (this.AllowedValues != null) + { + dto.AllowedValues = new List(this.AllowedValues); + } + + // type: Signal + dto.SignalValue = this.SignalValue; + + return dto; + } + + public static Setting FromDTO(SettingDTO dto) + { + Setting setting = CreateInstance(); + dto.ApplyTo(setting); + return setting; + } + + public enum SettingType + { + Int, + Float, + String, + Bool, + Signal + } +} + + +[System.Serializable] +public class SettingDTO +{ + // general + public Setting.SettingType Type; + public string Id; + public string Alias; + public string Description; + + // type: Bool + public bool BoolValue; + + // type: Int + public int IntValue; + public int IntMin; + public int IntMax; + public int IntStep; + + // type: Float + public float FloatValue; + public float FloatMin; + public float FloatMax; + public float FloatStep; + + // type: String + public string StringValue; + public List AllowedValues; + + // type: Signal + public string SignalValue; + + // Метод для восстановления из DTO в Setting (опционально) + public void ApplyTo(Setting setting) + { + setting.Type = this.Type; + setting.Id = this.Id; + setting.Alias = this.Alias; + setting.Description = this.Description; + setting.BoolValue = this.BoolValue; + setting.IntValue = this.IntValue; + setting.IntMin = this.IntMin; + setting.IntMax = this.IntMax; + setting.IntStep = this.IntStep; + setting.FloatValue = this.FloatValue; + setting.FloatMin = this.FloatMin; + setting.FloatMax = this.FloatMax; + setting.FloatStep = this.FloatStep; + setting.StringValue = this.StringValue; + setting.SignalValue = this.SignalValue; + + if (this.AllowedValues != null) + { + setting.AllowedValues = new List(this.AllowedValues); + } + } + + // Метод для получения хэша из DTO + public string GetStringForHash() + { + string result = Id; + result += Alias; + result += Description; + + switch (Type) + { + case Setting.SettingType.Bool: + break; + case Setting.SettingType.Int: + result += IntMin + IntMax + IntStep; + break; + case Setting.SettingType.Float: + result += FloatMin + FloatMax + FloatStep; + break; + case Setting.SettingType.String: + if (AllowedValues != null) + foreach (string s in AllowedValues) result += s; + break; + case Setting.SettingType.Signal: + result += SignalValue; + break; + } + + return result; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Setting.cs.meta b/Assets/Scripts/Settings/Models/Setting.cs.meta similarity index 100% rename from Assets/Scripts/Settings/Setting.cs.meta rename to Assets/Scripts/Settings/Models/Setting.cs.meta diff --git a/Assets/Scripts/Settings/Models/SettingsGroup.cs b/Assets/Scripts/Settings/Models/SettingsGroup.cs new file mode 100644 index 0000000..72a6b5d --- /dev/null +++ b/Assets/Scripts/Settings/Models/SettingsGroup.cs @@ -0,0 +1,79 @@ +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "SettingGroup", menuName = "Создание настроек/Создать группу настроек")] +public class SettingsGroup : ScriptableObject +{ + public string Name; + public string IconPath; + public List Settings; + + public SettingsGroupDTO GetDTO() + { + SettingsGroupDTO dto = new SettingsGroupDTO(); + + dto.Name = this.Name; + dto.IconPath = this.IconPath; + // Конвертируем список Setting в DTO + dto.Settings = new List(); + if (this.Settings != null) + { + foreach (var setting in this.Settings) + { + if (setting != null) + { + dto.Settings.Add(setting.GetDTO()); + } + } + } + + return dto; + } + + public static SettingsGroup FromDTO(SettingsGroupDTO dto) + { + SettingsGroup group = CreateInstance(); + dto.ApplyTo(group); + return group; + } + +} + + +[System.Serializable] +public class SettingsGroupDTO +{ + public string Name; + public string IconPath; + public List Settings; + + // Метод для восстановления из DTO в SettingsGroup + public void ApplyTo(SettingsGroup group) + { + group.Name = this.Name; + group.Settings = new List(); + + if (this.Settings != null) + { + foreach (var settingDTO in this.Settings) + { + Setting setting = Setting.FromDTO(settingDTO); + group.Settings.Add(setting); + } + } + } + + public string GetStringForHash() + { + string result = Name+IconPath; + + if (Settings != null) + { + foreach (var setting in Settings) + { + result += setting.GetStringForHash(); + } + } + return result; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Models/SettingsGroup.cs.meta b/Assets/Scripts/Settings/Models/SettingsGroup.cs.meta new file mode 100644 index 0000000..531bad0 --- /dev/null +++ b/Assets/Scripts/Settings/Models/SettingsGroup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2ea1983628bbc4c4c8dfdc2a1637e058 \ No newline at end of file diff --git a/Assets/Scripts/Settings/Models/SettingsScheme.cs b/Assets/Scripts/Settings/Models/SettingsScheme.cs new file mode 100644 index 0000000..a7a92d0 --- /dev/null +++ b/Assets/Scripts/Settings/Models/SettingsScheme.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Security.Cryptography; +using System.Text; +using UnityEngine; + +[CreateAssetMenu(fileName = "SettingsScheme", menuName = "Создание настроек/Создать схему настроек")] +public class SettingsScheme : ScriptableObject +{ + public List groups; + + public string CalculateHash() + { + var sb = new StringBuilder(); + + foreach (var group in groups) + { + sb.Append(group.name); + foreach(var setting in group.Settings) + { + sb.Append(setting.GetStringForHash()); + } + } + + Debug.Log($"Сырые хэш данные: {sb.ToString()}"); + + string hash; + using (SHA256 sha256 = SHA256.Create()) + { + byte[] hashBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString())); + hash = BitConverter.ToString(hashBytes).Replace("-", ""); + Debug.Log($"Хэш: {sb.ToString()}"); + } + + return hash; + } + + + public SettingsSchemeDTO GetDTO() + { + SettingsSchemeDTO dto = new SettingsSchemeDTO(); + + dto.groups = new List(); + + if (this.groups != null) + { + foreach (var group in this.groups) + { + if (group != null) + { + dto.groups.Add(group.GetDTO()); + } + } + } + + return dto; + } + + // Статический метод для создания SettingsScheme из DTO + public static SettingsScheme FromDTO(SettingsSchemeDTO dto) + { + SettingsScheme scheme = CreateInstance(); + dto.ApplyTo(scheme); + return scheme; + } +} + +[System.Serializable] +public class SettingsSchemeDTO +{ + public List groups; + + // Метод для восстановления из DTO в SettingsScheme + public void ApplyTo(SettingsScheme scheme) + { + scheme.groups = new List(); + + if (this.groups != null) + { + foreach (var groupDTO in this.groups) + { + SettingsGroup group = SettingsGroup.FromDTO(groupDTO); + scheme.groups.Add(group); + } + } + } + + // Метод для расчета хэша из DTO + public string CalculateHash() + { + var sb = new StringBuilder(); + + foreach (var group in groups) + { + sb.Append(group.Name); + sb.Append(group.IconPath); + foreach (var setting in group.Settings) + { + sb.Append(setting.GetStringForHash()); + } + } + + using (SHA256 sha256 = SHA256.Create()) + { + byte[] hashBytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(sb.ToString())); + string hash = BitConverter.ToString(hashBytes).Replace("-", ""); + return hash; + } + } +} diff --git a/Assets/Scripts/Settings/Models/SettingsScheme.cs.meta b/Assets/Scripts/Settings/Models/SettingsScheme.cs.meta new file mode 100644 index 0000000..098419d --- /dev/null +++ b/Assets/Scripts/Settings/Models/SettingsScheme.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a114b7be96b4d264d8ea2198bfeca5e4 \ No newline at end of file diff --git a/Assets/Scripts/Settings/PasswordCatcher.cs b/Assets/Scripts/Settings/PasswordCatcher.cs deleted file mode 100644 index d8e0c1f..0000000 --- a/Assets/Scripts/Settings/PasswordCatcher.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class PasswordCatcher : MonoBehaviour -{ - private bool passwordForSettings; - - public void Initialize() - { - passwordForSettings = SettingsManager.GetBool("PasswordOnSettings", false); - SettingsManager.OnSettingsChanged.AddListener(ApplySettings); - } - - private void ApplySettings() - { - bool passwordForSettingsNewValue = SettingsManager.GetBool("PasswordOnSettings", false); - if (NeedToSetPassword(passwordForSettingsNewValue)) - { - passwordForSettings = passwordForSettingsNewValue; - GameManager.instance.stateMachine.ChangeState(new SetupPasswordState()); - } - if (NeedToRemovePassword(passwordForSettingsNewValue)) - { - ExternalFilesGetter.SetPassword(""); - print("Пароль сброшен"); - } - } - - private bool NeedToRemovePassword(bool newValue) => - //значение поменялось на не нужен пароль - newValue != passwordForSettings && newValue == false; - private bool NeedToSetPassword(bool passwordForSettingsNewValue) - { - //поменялось значение настройки на "Пароль нужен" - bool changeStateToNeedPassword = passwordForSettingsNewValue != passwordForSettings && passwordForSettingsNewValue; - if (changeStateToNeedPassword) return true; - - //Должен быть пароль но его нет или он не валидный. - if(passwordForSettingsNewValue && PasswordFileNonValid()) return true; - - return false; - } - - private bool PasswordFileNonValid() - { - string password = ExternalFilesGetter.GetSettingsPassword(); - if (password == null) return true; - if(password.Length % 2 == 1) return true;//длина должны быть четной - if (!PwdCombinationsValid(SplitPasswordIntoPairs(password))) return true; // парольные комбинации валидны? - - return false; - } - - List SplitPasswordIntoPairs(string password) - { - List result = new List(); - for (int i = 0; i < password.Length; i += 2) - { - result.Add(password.Substring(i, 2)); - } - - return result; - } - - private bool PwdCombinationsValid(List combinations) - { - List validCombinations = new List { "L1", "L2", "R1", "R2", "A1", "A2", "P1", "P2" }; - - foreach (string combination in combinations) - { - if (!validCombinations.Contains(combination)) return false; - } - return true; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/PasswordCatcher.cs.meta b/Assets/Scripts/Settings/PasswordCatcher.cs.meta deleted file mode 100644 index 30cd41d..0000000 --- a/Assets/Scripts/Settings/PasswordCatcher.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 38e2f7887ebdd9f488a15d00e76f4392 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/PointerMover.cs b/Assets/Scripts/Settings/PointerMover.cs deleted file mode 100644 index 41559ad..0000000 --- a/Assets/Scripts/Settings/PointerMover.cs +++ /dev/null @@ -1,17 +0,0 @@ -using UnityEngine; - -public class PointerMover : MonoBehaviour -{ - public RectTransform rect; - public float amplitudeX = 15; - public float frequency = 2; - - private Vector2 startPosition; - - private void Update() - { - Vector2 newPosition = new Vector2(x: startPosition.x + amplitudeX * Mathf.Sin(Time.time * frequency), - y: startPosition.y); - rect.anchoredPosition = newPosition; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/PointerMover.cs.meta b/Assets/Scripts/Settings/PointerMover.cs.meta deleted file mode 100644 index 99beab1..0000000 --- a/Assets/Scripts/Settings/PointerMover.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d3a92d5d28462064f9d11d5b0fb6371d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/ScreenTester.cs b/Assets/Scripts/Settings/ScreenTester.cs deleted file mode 100644 index 618b344..0000000 --- a/Assets/Scripts/Settings/ScreenTester.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; - -public class ScreenTester : MonoBehaviour -{ - [SerializeField] float timeToDisable = 4; - - private void OnEnable() => Invoke("disable", timeToDisable); - - public void disable() => gameObject.SetActive(false); -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/ScreenTester.cs.meta b/Assets/Scripts/Settings/ScreenTester.cs.meta deleted file mode 100644 index 906715f..0000000 --- a/Assets/Scripts/Settings/ScreenTester.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc5bfad969b74a143a1d679b4c3794e8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SetPasswordPanel.cs b/Assets/Scripts/Settings/SetPasswordPanel.cs deleted file mode 100644 index 5f1d0d0..0000000 --- a/Assets/Scripts/Settings/SetPasswordPanel.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class SetPasswordPanel : MonoBehaviour -{ - [SerializeField] GameObject ModalWindow; - [SerializeField] AnimationCurve fillCurve; - - int enteredSymbols = 0; - int SymbolsCount = 6; - - float acceptTimer = 0; - public Image AcceptImage; - - float clearTimer = 0; - public Image ClearImage; - - public List symbols = new List(); - - public List slots; - public GameObject L1; - public GameObject L2; - public GameObject R1; - public GameObject R2; - public GameObject D1; - public GameObject D2; - private List spawnedObjs = new(); - - List availableButtons = new List - { - ButtonPinMapping.left1, - ButtonPinMapping.left2, - ButtonPinMapping.right1, - ButtonPinMapping.right2, - ButtonPinMapping.down1, - ButtonPinMapping.down2, - }; - bool ready = false; - - private void OnEnable() => ModalWindow.SetActive(true); - - void Update() - { - if (!ready) - { - ready = AllButtonsUp(); - return; - } - - //когда готово - //p1 применить - AcceptProcess(); - //p2 очистить - ClearProcess(); - - //получить комбинацию по кнопке - ButtonsProcess(); - } - - void AcceptProcess() - { - ProcessImageTimer(AcceptImage, acceptTimer, 2); - if (enteredSymbols != SymbolsCount) return; - - if (In.GetButton(ButtonPinMapping.startOnePlayer)) acceptTimer += Time.deltaTime; - else acceptTimer -= Time.deltaTime; - acceptTimer = Mathf.Clamp(acceptTimer, 0.0f, 2.0f); - - if (acceptTimer == 2) - { - acceptTimer = 0.0f; - Accept(); - } - } - private void Accept() - { - string pwd = ""; - foreach (var s in symbols) - { - pwd += s; - } - ExternalFilesGetter.SetPassword(pwd); - Clear(); - GameManager.instance.stateMachine.ChangeState(new SettingsState()); - } - - void ClearProcess() - { - if (In.GetButton(ButtonPinMapping.startTwoPlayers)) clearTimer += Time.deltaTime; - else clearTimer -= Time.deltaTime; - clearTimer = Mathf.Clamp(clearTimer, 0.0f, 2.0f); - ProcessImageTimer(ClearImage, clearTimer, 2); - - if (clearTimer == 2) - { - clearTimer = 0.0f; - Clear(); - } - } - - private void Clear() - { - acceptTimer = 0; - clearTimer = 0; - enteredSymbols = 0; - symbols.Clear(); - - foreach (var go in spawnedObjs) - { - Destroy(go); - } - spawnedObjs.Clear(); - ready = false; - } - - void ButtonsProcess() - { - if (enteredSymbols >= SymbolsCount) return; - - foreach (ButtonPinMapping button in availableButtons) - { - if (In.GetButtonDown(button)) - { - string combinationStr = GetStrCombination(button); - symbols.Add(combinationStr); - DisplaySymbol(combinationStr); - enteredSymbols++; - return; - } - } - } - - void DisplaySymbol(string symbol) - { - GameObject prefab = symbol switch - { - "L1" => L1, - "L2" => L2, - "R1" => R1, - "R2" => R2, - "A1" => D1, - "A2" => D2, - _ => L1 - }; - - GameObject spawned = Instantiate(prefab, slots[enteredSymbols]); - spawnedObjs.Add(spawned); - } - - string GetStrCombination(ButtonPinMapping button) - => button switch - { - ButtonPinMapping.left1 => "L1", - ButtonPinMapping.left2 => "L2", - ButtonPinMapping.right1 => "R1", - ButtonPinMapping.right2 => "R2", - ButtonPinMapping.down1 => "A1", - ButtonPinMapping.down2 => "A2", - _ => null - }; - - void ProcessImageTimer(Image image, float time, float maxtime) - => image.fillAmount = fillCurve.Evaluate(time / maxtime); - - bool AllButtonsUp() - { - bool anyButtonDown = - In.GetButtonAnyPlayer(PlayerAction.left) || - In.GetButtonAnyPlayer(PlayerAction.right) || - In.GetButtonAnyPlayer(PlayerAction.down) || - In.GetButtonDown(ButtonPinMapping.startOnePlayer) || - In.GetButtonDown(ButtonPinMapping.startOnePlayer); - - if (anyButtonDown) return false; - else - { - ModalWindow.SetActive(false); - return true; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SetPasswordPanel.cs.meta b/Assets/Scripts/Settings/SetPasswordPanel.cs.meta deleted file mode 100644 index 39e1491..0000000 --- a/Assets/Scripts/Settings/SetPasswordPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3ccde8447a38ec94da5c96f51363eae5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Setting.cs b/Assets/Scripts/Settings/Setting.cs deleted file mode 100644 index 4950a09..0000000 --- a/Assets/Scripts/Settings/Setting.cs +++ /dev/null @@ -1,444 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -public class Setting : IViewStringSupplier -{ - #region FIELDS - //general - public string Id { get; set; } - public string Alias { get; set; } - public string Group { get; set; } - public SettingType Type { get; set; } - public bool Cycling { get; set; } - - //type: Bool - public bool BoolValue { get; set; } - - //type: Int - public int IntValue { get; set; } - public int IntMin { get; set; } - public int IntMax { get; set; } - public int IntStep { get; set; } - - //type: Float - public float FloatValue { get; set; } - public float FloatMin { get; set; } - public float FloatMax { get; set; } - public float FloatStep { get; set; } - - //type: String - public string StringValue { get; set; } - public List AllowedValues { get; private set; } - #endregion - - #region CONSTRUCTORS - /// - /// Базовый конструктор - /// - private Setting(string id, - string alias, - string group, - SettingType type, - bool cycling) - { - this.Id = id; - this.Alias = alias; - this.Group = group; - this.Type = type; - this.Cycling = cycling; - } - - /// - /// Bool конструктор - /// - public Setting(string id, string alias, string group, SettingType type, bool value, bool cycling) : this(id, alias, group, type, cycling) - { - //Валидация типа - CheckType(type, SettingType.Bool, id); - BoolValue = value; - } - - /// - /// Int конструктор - /// - public Setting(string id, string alias, string group, SettingType type, bool cycling, int value, int min, int max, int step) : this(id, alias, group, type, cycling) - { - CheckType(type, SettingType.Int, id); - ValidateInt(value: ref value, - min: ref min, - max: ref max, - step: ref step, - settingId: id); - - this.IntValue = value; - this.IntMin = min; - this.IntMax = max; - this.IntStep = step; - } - - /// - /// Float конструктор - /// - public Setting(string id, string alias, string group, SettingType type, bool cycling, float value, float min, float max, float step) : this(id, alias, group, type, cycling) - { - CheckType(type, SettingType.Float, id); - ValidateFloat(value: ref value, - min: ref min, - max: ref max, - step: ref step, - settingId: id); - - this.FloatValue = value; - this.FloatMin = min; - this.FloatMax = max; - this.FloatStep = step; - } - - /// - /// String конструктор - /// - public Setting(string id, string alias, string group, SettingType type, bool cycling, string value, List allowedValues) : this(id, alias, group, type, cycling) - { - CheckType(type, SettingType.String, id); - - ValidateString(ref value, allowedValues, id); - this.AllowedValues = allowedValues; - this.StringValue = value; - - - } - #endregion - - #region HELPERS - private void CheckType(SettingType type, SettingType expectedType, string id) - { - if (type != expectedType) throw new System.Exception($"Настройка {id}. Несоответствие типов."); - } - - - private void ValidateInt(ref int value, ref int min, ref int max, ref int step, string settingId) - { - bool hasWarning = false; - string WarningText = string.Empty; - - if (min > max) - { - hasWarning = true; - WarningText += $"Максимум ({max}) ниже минимума ({min}). Минимум и максимум поменяны местами.\n"; - (min, max) = (max, min); - } - - if (value < min) - { - hasWarning = true; - WarningText += $"Значение {value} ниже минимума {min}. Установлено значение {min}.\n"; - value = min; - } - - if (value > max) - { - hasWarning = true; - WarningText += $"Значение {value} выше максимума {max}. Установлено значение {max}.\n"; - value = max; - } - - int delta = max - min; - if (step > delta) - { - hasWarning = true; - WarningText += $"Шаг ({step}) установлен выше чем разница максимума и минимума ({delta}). Шаг установлен в значение {delta}.\n"; - step = delta; - } - - if (step < 0) - { - hasWarning = true; - WarningText += $"Шаг ({step}) не может быть отрицательным. Значение инвертировано ({-step}).\n"; - step = -step; - } - - if (hasWarning) Debug.LogWarning($"Настройка {settingId}:\n" + WarningText); - } - private void ValidateFloat(ref float value, ref float min, ref float max, ref float step, string settingId) - { - bool hasWarning = false; - string WarningText = string.Empty; - - if (min > max) - { - hasWarning = true; - WarningText += $"Максимум ({max}) ниже минимума ({min}). Минимум и максимум поменяны местами.\n"; - (min, max) = (max, min); - } - - if (value < min) - { - hasWarning = true; - WarningText += $"Значение {value} ниже минимума {min}. Установлено значение {min}.\n"; - value = min; - } - - if (value > max) - { - hasWarning = true; - WarningText += $"Значение {value} выше максимума {max}. Установлено значение {max}.\n"; - value = max; - } - - float delta = max - min; - if (step > delta) - { - hasWarning = true; - WarningText += $"Шаг ({step}) установлен выше чем разница максимума и минимума ({delta}). Шаг установлен в значение {delta}.\n"; - step = delta; - } - - if (step < 0) - { - hasWarning = true; - WarningText += $"Шаг ({step}) не может быть отрицательным. Значение инвертировано ({-step}).\n"; - step = -step; - } - - if (hasWarning) Debug.LogWarning($"Настройка {settingId}:\n" + WarningText); - } - private void ValidateString(ref string value, List allowedValues, string settingId) - { - if (allowedValues == null) - { - Debug.LogWarning($"Настройка {settingId}:\nСписок значений null"); - } - else if (allowedValues.Count == 0) - { - Debug.LogWarning($"Настройка {settingId}:\nСписок значений пуст"); - } - else if (!allowedValues.Contains(value)) - { - string newValue = allowedValues[allowedValues.Count / 2]; - Debug.LogWarning($"Настройка {settingId}:\nСписок значений не содержит установленного значения{value}. Установлено среднее значение {newValue}."); - value = newValue; - } - } - #endregion - - #region CONTROLS - //Возвращает изменилось ли значение - public bool ChangeValue(int direction) - => Type switch - { - SettingType.Bool => ChangeBool(direction), - SettingType.Int => ChangeInt(direction), - SettingType.Float => ChangeFloat(direction), - SettingType.String => ChangeString(direction), - _ => false - }; - - private bool ChangeBool(int direction) - { - if (direction == 0) return false; - - if (Cycling) - { - BoolValue = !BoolValue; - return true; - } - else - { - bool newValue = direction > 0; - if (newValue == BoolValue) return false; - BoolValue = newValue; - return true; - } - } - private bool ChangeInt(int direction) - { - if (direction == 0) return false; - int sign = Mathf.Clamp(direction, -1, 1); - - int newValue = IntValue + IntStep * sign; - - if (Cycling) - { - int range = IntMax - IntMin + 1; - - if (newValue > IntMax) - newValue = IntMin + (newValue - IntMax - 1) % range; - else if (newValue < IntMin) - newValue = IntMax - (IntMin - newValue - 1) % range; - } - - else - { - newValue = Mathf.Clamp(newValue, IntMin, IntMax); - } - - if (IntValue == newValue) return false; - IntValue = newValue; - return true; - } - private bool ChangeFloat(int direction) - { - if (direction == 0) return false; - float sign = Mathf.Sign(direction); - - float newValue = FloatValue + FloatStep * sign; - - if (Cycling) - { - float range = FloatMax - FloatMin; - - if (range <= 0) - { - // Если диапазон нулевой, просто возвращаем минимальное значение - newValue = FloatMin; - } - else if (newValue > FloatMax) - { - // Для циклического перехода через максимум - float overflow = newValue - FloatMax; - newValue = FloatMin + overflow % range; - } - else if (newValue < FloatMin) - { - // Для циклического перехода через минимум - float underflow = FloatMin - newValue; - newValue = FloatMax - underflow % range; - } - } - else - { - newValue = Mathf.Clamp(newValue, FloatMin, FloatMax); - } - - // Сравнение float с учетом погрешности - if (Mathf.Abs(FloatValue - newValue) < float.Epsilon) - return false; - - FloatValue = newValue; - return true; - } - private bool ChangeString(int direction) - { - if (direction == 0 || AllowedValues == null || AllowedValues.Count == 0) - return false; - - int sign = direction > 0 ? 1 : -1; - int currentIndex = AllowedValues.IndexOf(StringValue); - - // Если значение не в списке - if (currentIndex < 0) - { - return false; - } - - int newIndex = currentIndex + sign; - int maxIndex = AllowedValues.Count - 1; - - if (Cycling) - { - // Циклический переход - if (newIndex > maxIndex) - newIndex = 0; - else if (newIndex < 0) - newIndex = maxIndex; - } - else - { - // Без циклического режима - ограничение границами - newIndex = Mathf.Clamp(newIndex, 0, maxIndex); - } - - if (currentIndex == newIndex) - return false; - - StringValue = AllowedValues[newIndex]; - return true; - } - #endregion - - - #region SERIALIZATION - //Преобразовать класс в DTO - public SettingData ToSerializableData() - { - return new SettingData - { - Id = this.Id, - Alias = this.Alias, - Group = this.Group, - Type = this.Type, - Cycling = this.Cycling, - - BoolValue = this.BoolValue, - IntValue = this.IntValue, - FloatValue = this.FloatValue, - StringValue = this.StringValue, - - IntMin = this.IntMin, - IntMax = this.IntMax, - IntStep = this.IntStep, - - FloatMin = this.FloatMin, - FloatMax = this.FloatMax, - FloatStep = this.FloatStep, - - AllowedValues = this.AllowedValues - }; - } - - //Восстановить класс из DTO - public static Setting FromSerializableData(SettingData data) - { - return data.Type switch - { - SettingType.Bool => new Setting(id: data.Id, - alias: data.Alias, - group: data.Group, - type: data.Type, - cycling:data.Cycling, - value: data.BoolValue), - - SettingType.Int => new Setting(id: data.Id, - alias: data.Alias, - group: data.Group, - type: data.Type, - cycling: data.Cycling, - value: data.IntValue, - min: data.IntMin, - max: data.IntMax, - step: data.IntStep), - - SettingType.Float=> new Setting(id: data.Id, - alias: data.Alias, - group: data.Group, - type: data.Type, - cycling: data.Cycling, - value: data.FloatValue, - min: data.FloatMin, - max: data.FloatMax, - step: data.FloatStep), - - SettingType.String=>new Setting(id: data.Id, - alias: data.Alias, - group: data.Group, - type: data.Type, - cycling: data.Cycling, - value: data.StringValue, - allowedValues: data.AllowedValues), - _ => null - }; - } - - public string GetStringForView() - { - return Type switch - { - SettingType.Bool => BoolValue.ToString(), - SettingType.Int => IntValue.ToString(), - SettingType.Float => FloatValue.ToString(), - SettingType.String => StringValue, - _ => null - }; - } - - #endregion -} diff --git a/Assets/Scripts/Settings/SettingAction.cs b/Assets/Scripts/Settings/SettingAction.cs deleted file mode 100644 index 53b98d1..0000000 --- a/Assets/Scripts/Settings/SettingAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using UnityEngine.Events; - -[Serializable] -public class SettingAction -{ - public string Name = ""; - public string Group = ""; - public UnityEvent OnPressed; -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingAction.cs.meta b/Assets/Scripts/Settings/SettingAction.cs.meta deleted file mode 100644 index 1a22006..0000000 --- a/Assets/Scripts/Settings/SettingAction.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4f8a37aeba4a0ab4a95cf9c49aebc1e3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingData.cs b/Assets/Scripts/Settings/SettingData.cs deleted file mode 100644 index 9657ad9..0000000 --- a/Assets/Scripts/Settings/SettingData.cs +++ /dev/null @@ -1,25 +0,0 @@ -//Это DTO для сериализации -using System.Collections.Generic; - -[System.Serializable] -public class SettingData -{ - public string Id; - public string Alias; - public string Group; - public SettingType Type; - public bool Cycling; - - public bool BoolValue; - public int IntValue; - public float FloatValue; - public string StringValue; - - public int IntMin; - public int IntMax; - public int IntStep; - public float FloatMin; - public float FloatMax; - public float FloatStep; - public List AllowedValues; -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingData.cs.meta b/Assets/Scripts/Settings/SettingData.cs.meta deleted file mode 100644 index a62f603..0000000 --- a/Assets/Scripts/Settings/SettingData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7f0ebb59858de9a4a8ebbd346415e86f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingDataWrapper.cs b/Assets/Scripts/Settings/SettingDataWrapper.cs deleted file mode 100644 index 36482f0..0000000 --- a/Assets/Scripts/Settings/SettingDataWrapper.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; - -[System.Serializable] -public class SettingDataWrapper -{ - public List Items; - public SettingDataWrapper(List settings) - { - Items = new(); - foreach (var setting in settings) - { - Items.Add(setting.ToSerializableData()); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingDataWrapper.cs.meta b/Assets/Scripts/Settings/SettingDataWrapper.cs.meta deleted file mode 100644 index b3a5b22..0000000 --- a/Assets/Scripts/Settings/SettingDataWrapper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2c8b5fbb2bfad374d8c9406e76afff68 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingPrefab.prefab b/Assets/Scripts/Settings/SettingPrefab.prefab deleted file mode 100644 index 916407a..0000000 --- a/Assets/Scripts/Settings/SettingPrefab.prefab +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: 8886594288047508638} - m_Layer: 5 - m_Name: SettingPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 550, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &8886594288047508638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u041F\u0440\u0435\u0444\u0430\u0431 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/SettingPrefab.prefab.meta b/Assets/Scripts/Settings/SettingPrefab.prefab.meta deleted file mode 100644 index 8475d50..0000000 --- a/Assets/Scripts/Settings/SettingPrefab.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 959fadb1ff4c40540baceea041c5ab3f -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingSignalCatcher.cs b/Assets/Scripts/Settings/SettingSignalCatcher.cs new file mode 100644 index 0000000..d76794c --- /dev/null +++ b/Assets/Scripts/Settings/SettingSignalCatcher.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class SettingSignalCatcher : MonoBehaviour +{ + [SerializeField] private List signalToCallbackList; + + private void OnEnable() => SignalView.SignalEmmited += HandleSignal; + private void OnDisable() => SignalView.SignalEmmited -= HandleSignal; + + public void HandleSignal(string entrySignal) + { + foreach (var signalToCallback in signalToCallbackList) + { + if (signalToCallback.Signal == entrySignal) + { + signalToCallback.Callback?.Invoke(); + return; + } + } + Debug.LogWarning($"Callback для сигнала {entrySignal} не задан", this); + } + + [Serializable] + class SignalToCallback + { + public string Signal; + public UnityEvent Callback; + } +} diff --git a/Assets/Scripts/Settings/SettingSignalCatcher.cs.meta b/Assets/Scripts/Settings/SettingSignalCatcher.cs.meta new file mode 100644 index 0000000..eccd227 --- /dev/null +++ b/Assets/Scripts/Settings/SettingSignalCatcher.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 76dd186285f4f5c4a8f2c3e1b9a3cd19 \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingType.cs b/Assets/Scripts/Settings/SettingType.cs deleted file mode 100644 index 0c71a03..0000000 --- a/Assets/Scripts/Settings/SettingType.cs +++ /dev/null @@ -1,7 +0,0 @@ -public enum SettingType -{ - Int, - Float, - String, - Bool -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingType.cs.meta b/Assets/Scripts/Settings/SettingType.cs.meta deleted file mode 100644 index d2b95cd..0000000 --- a/Assets/Scripts/Settings/SettingType.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cd7f61a796614f04ca5accb16ec2b7d9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingsContainer.cs b/Assets/Scripts/Settings/SettingsContainer.cs deleted file mode 100644 index 519f39d..0000000 --- a/Assets/Scripts/Settings/SettingsContainer.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; - -[System.Serializable] -public class SettingsContainer -{ - public List Settings { get; private set; } - public SettingsContainer(List settings) - => SetSettingsList(settings); - public SettingsContainer(SettingDataWrapper wrapper) - { - List settings = new List(); - foreach (var item in wrapper.Items) - { - Setting parsedFromDTO = Setting.FromSerializableData(item); - settings.Add(parsedFromDTO); - } - - SetSettingsList(settings); - } - - public Setting TryGetSetting(string id) - => Settings.Find(s => s.Id == id); - public void SetSettingsList(List settings) - { - Settings = new List(settings); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingsContainer.cs.meta b/Assets/Scripts/Settings/SettingsContainer.cs.meta deleted file mode 100644 index aa587cc..0000000 --- a/Assets/Scripts/Settings/SettingsContainer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9612e4eeb671b4d4198da029cd7047bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SettingsFunctions.cs b/Assets/Scripts/Settings/SettingsFunctions.cs new file mode 100644 index 0000000..eb8c598 --- /dev/null +++ b/Assets/Scripts/Settings/SettingsFunctions.cs @@ -0,0 +1,47 @@ +using UnityEngine; + +public class SettingsFunctions : MonoBehaviour +{ + [SerializeField] private SettingsScreen _settingsScreen; + [SerializeField] private CountersPanel _countersPanel; + [SerializeField] private TextInput _number; + + private ICompletable completableModal; + + public void ExitToMenu() + { + SettingsManager.SaveSettings(); + } + + //public void _ResetBalance() => WalletManager.ResetBalance(); + + //public void _OpenCounters() + //{ + // _settingsScreen.DisableControls(); + // _countersPanel.gameObject.SetActive(true); + + // completableModal = _countersPanel; + // completableModal.OnComplete += ReturnMainControls; + //} + + //public void _EnterNumberTech() + //{ + // _settingsScreen.DisableControls(); + // _number.gameObject.SetActive(true); + // _number.Initialize(); + + // completableModal = _number; + // completableModal.OnComplete += ReturnMainControls; + //} + //public void _ExitGame() => Application.Quit(); + + //private void ReturnMainControls() + //{ + // _settingsScreen.EnableControls(); + // if (completableModal != null) + // completableModal.OnComplete -= ReturnMainControls; + // completableModal = null; + //} + + +} diff --git a/Assets/Scripts/Common/Leaderboard/TextInput.cs.meta b/Assets/Scripts/Settings/SettingsFunctions.cs.meta similarity index 83% rename from Assets/Scripts/Common/Leaderboard/TextInput.cs.meta rename to Assets/Scripts/Settings/SettingsFunctions.cs.meta index 76d52f1..62da2e4 100644 --- a/Assets/Scripts/Common/Leaderboard/TextInput.cs.meta +++ b/Assets/Scripts/Settings/SettingsFunctions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f2cb7146587aca4db2a8f47e1a3e2d4 +guid: 687f30286b950b74fb829a04610b20f0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Settings/SettingsManager.cs b/Assets/Scripts/Settings/SettingsManager.cs index 1083cdb..e92ef50 100644 --- a/Assets/Scripts/Settings/SettingsManager.cs +++ b/Assets/Scripts/Settings/SettingsManager.cs @@ -1,295 +1,502 @@ -using System.Collections.Generic; -using System.IO; -using System.Security.Cryptography; -using System.Text; +using System; +using System.Collections.Generic; using UnityEngine; -using UnityEngine.Events; -public class SettingsManager : MonoBehaviour +public static class SettingsManager { - public static SettingsManager instance; - private static string SETTINGS_FILE_PATH => Path.Combine(Application.persistentDataPath, "GameSettings.json"); - public static SettingsContainer Container; - public static UnityEvent OnSettingsChanged; + public static event Action SettingsSaved; + public static event Action OnSettingsChanged; - public static void Initialize() //добавить инициализацию в менеджера в парвильное место в порядке + private static string SettingsFileName = "GameSettings.json"; + private static string SettingsPath => Application.persistentDataPath; + public static SettingsSchemeDTO currentSchemeDTO { get; private set; } + + // Обновленный метод Initialize с обработкой ошибок загрузки + public static void Initialize(SettingsScheme defaultSchemeAsset) { - OnSettingsChanged = new UnityEvent(); - Container = LoadContainerAuto(); - OnSettingsChanged?.Invoke(); + LoadSettings(defaultSchemeAsset); } - public static void ChangeSetting(Setting setting, int direction) + #region Load/Save/Restore + private static void LoadSettings(SettingsScheme defaultSchemeAsset) { - bool changed = setting.ChangeValue(direction); - if (changed) + try { - SaveContainerToFile(); - OnSettingsChanged?.Invoke(); + if (defaultSchemeAsset == null) + { + Debug.LogError("Default scheme asset is null!"); + return; + } + + // Конвертируем дефолтную схему в DTO + var defaultDTO = defaultSchemeAsset.GetDTO(); + + if (defaultDTO == null) + { + Debug.LogError("Failed to convert default scheme to DTO!"); + return; + } + + SettingsSchemeDTO loadedDTO = null; + bool loadSuccess = false; + + try + { + var loadResult = FileUtil.LoadJson(SettingsFileName, SettingsPath); + Debug.Log(loadResult.Message); + + if (loadResult.OK && loadResult.Data != null) + { + loadedDTO = loadResult.Data; + loadSuccess = true; + } + } + catch (Exception ex) + { + Debug.LogError($"Error loading settings file: {ex.Message}"); + } + + if (!loadSuccess || loadedDTO == null) + { + currentSchemeDTO = CloneSettingsScheme(defaultDTO); + Debug.Log("Загружена схема настроек по умолчанию (файл отсутствует или поврежден)"); + SaveSettings(); + return; + } + + string defaultHash = defaultDTO.CalculateHash(); + string loadedHash = loadedDTO.CalculateHash(); + + if (string.Compare(defaultHash, loadedHash, StringComparison.Ordinal) == 0) + { + currentSchemeDTO = loadedDTO; + Debug.Log("Загружена схема настроек из файла"); + return; + } + + // Хэши не совпадают - восстанавливаем совместимые настройки + Debug.Log("Обнаружено несоответствие схем. Выполняется восстановление настроек..."); + currentSchemeDTO = RestoreSettings(defaultDTO, loadedDTO); + + // Проверяем, что восстановление прошло успешно + if (currentSchemeDTO == null) + { + Debug.LogError("Restore settings failed! Using default settings."); + currentSchemeDTO = CloneSettingsScheme(defaultDTO); + } + + SaveSettings(); + } + catch (Exception ex) + { + Debug.LogError($"Critical error in Initialize: {ex.Message}\n{ex.StackTrace}"); + // Последняя попытка - создать дефолтную схему + if (defaultSchemeAsset != null) + { + currentSchemeDTO = defaultSchemeAsset.GetDTO(); + SaveSettings(); + } } } - //Геттеры возможно будут статикой - public static bool GetBool(string id, bool _default) + private static SettingsSchemeDTO RestoreSettings(SettingsSchemeDTO defaultDTO, SettingsSchemeDTO loadedDTO) { - var setting = Container.TryGetSetting(id); + try + { + // Проверяем входные параметры + if (defaultDTO == null) + { + Debug.LogError("defaultDTO is null! Cannot restore settings."); + return null; + } - if (setting != null) - { - if (setting.Type != SettingType.Bool) Debug.LogWarning($"Тип настройки {id} не соответсвует bool"); - return setting.BoolValue; + if (loadedDTO == null) + { + Debug.LogWarning("loadedDTO is null, using default settings"); + return CloneSettingsScheme(defaultDTO); + } + + // Проверяем, что у defaultDTO есть группы + if (defaultDTO.groups == null || defaultDTO.groups.Count == 0) + { + Debug.LogError("defaultDTO has no groups! Cannot restore settings."); + return CloneSettingsScheme(defaultDTO); + } + + var restoredDTO = new SettingsSchemeDTO(); + restoredDTO.groups = new List(); + + // Создаем словарь для быстрого поиска групп и настроек из загруженной схемы + var loadedGroupsMap = new Dictionary(); + if (loadedDTO.groups != null) + { + foreach (var group in loadedDTO.groups) + { + if (group != null && !string.IsNullOrEmpty(group.Name)) + { + // Если группа с таким именем уже есть, пропускаем дубликат + if (!loadedGroupsMap.ContainsKey(group.Name)) + { + loadedGroupsMap[group.Name] = group; + } + else + { + Debug.LogWarning($"Duplicate group name found: {group.Name}, skipping duplicate"); + } + } + } + } + + // Проходим по каждой группе в дефолтной схеме + foreach (var defaultGroup in defaultDTO.groups) + { + if (defaultGroup == null) + { + Debug.LogWarning("Null group found in defaultDTO, skipping"); + continue; + } + + try + { + var restoredGroup = new SettingsGroupDTO(); + restoredGroup.Name = defaultGroup.Name; + restoredGroup.IconPath = defaultGroup.IconPath; + restoredGroup.Settings = new List(); + + // Создаем словарь настроек загруженной группы (если она существует) + var loadedSettingsMap = new Dictionary(); + if (loadedGroupsMap.TryGetValue(defaultGroup.Name, out var loadedGroup) && loadedGroup != null) + { + if (loadedGroup.Settings != null) + { + foreach (var setting in loadedGroup.Settings) + { + if (setting != null && !string.IsNullOrEmpty(setting.Id)) + { + try + { + string settingHash = setting.GetStringForHash(); + if (!loadedSettingsMap.ContainsKey(settingHash)) + { + loadedSettingsMap[settingHash] = setting; + } + } + catch (Exception ex) + { + Debug.LogError($"Error calculating hash for setting {setting.Id}: {ex.Message}"); + } + } + } + } + } + + // Проходим по каждой настройке в дефолтной группе + if (defaultGroup.Settings != null) + { + foreach (var defaultSetting in defaultGroup.Settings) + { + if (defaultSetting == null) + { + Debug.LogWarning("Null setting found in default group, skipping"); + continue; + } + + try + { + string defaultSettingHash = defaultSetting.GetStringForHash(); + SettingDTO finalSetting = null; + + // Пытаемся найти совместимую настройку + if (loadedSettingsMap.TryGetValue(defaultSettingHash, out var compatibleSetting)) + { + // Нашли - берем значение из загруженной настройки + finalSetting = CopySettingValue(compatibleSetting, defaultSetting); + Debug.Log($"Восстановлена настройка: {defaultSetting.Id} из группы {defaultGroup.Name}"); + } + else + { + // Не нашли - берем значение по умолчанию + finalSetting = CopySettingStructure(defaultSetting); + Debug.Log($"Использовано значение по умолчанию для настройки: {defaultSetting.Id} из группы {defaultGroup.Name}"); + } + + if (finalSetting != null) + { + restoredGroup.Settings.Add(finalSetting); + } + } + catch (Exception ex) + { + Debug.LogError($"Error restoring setting {defaultSetting.Id} from group {defaultGroup.Name}: {ex.Message}"); + // Добавляем настройку по умолчанию в случае ошибки + var fallbackSetting = CopySettingStructure(defaultSetting); + if (fallbackSetting != null) + { + restoredGroup.Settings.Add(fallbackSetting); + } + } + } + } + + restoredDTO.groups.Add(restoredGroup); + } + catch (Exception ex) + { + Debug.LogError($"Error restoring group {defaultGroup.Name}: {ex.Message}"); + // Пытаемся добавить группу с настройками по умолчанию + try + { + var fallbackGroup = CopyGroupStructure(defaultGroup); + if (fallbackGroup != null) + { + restoredDTO.groups.Add(fallbackGroup); + } + } + catch (Exception fallbackEx) + { + Debug.LogError($"Failed to create fallback group {defaultGroup.Name}: {fallbackEx.Message}"); + } + } + } + + // Проверяем, что у нас есть хотя бы одна группа + if (restoredDTO.groups == null || restoredDTO.groups.Count == 0) + { + Debug.LogError("Failed to restore any groups! Using default settings."); + return CloneSettingsScheme(defaultDTO); + } + + Debug.Log($"Настройки восстановлены успешно. Групп: {restoredDTO.groups.Count}"); + return restoredDTO; } - else + catch (Exception ex) { - return _default; + Debug.LogError($"Critical error in RestoreSettings: {ex.Message}\n{ex.StackTrace}"); + // В случае критической ошибки возвращаем копию дефолтной схемы + return CloneSettingsScheme(defaultDTO); } } - public static int GetInt(string id, int _default) + // Вспомогательный метод для создания глубокой копии схемы + private static SettingsSchemeDTO CloneSettingsScheme(SettingsSchemeDTO source) { - var setting = Container.TryGetSetting(id); + if (source == null) return null; - if (setting != null) + try { - if (setting.Type != SettingType.Int) Debug.LogWarning($"Тип настройки {id} не соответсвует int"); - return setting.IntValue; + var clone = new SettingsSchemeDTO(); + clone.groups = new List(); + + if (source.groups != null) + { + foreach (var group in source.groups) + { + if (group != null) + { + var groupClone = CopyGroupStructure(group); + if (groupClone != null) + { + clone.groups.Add(groupClone); + } + } + } + } + + return clone; } - - return _default; - } - - public static float GetFloat(string id, float _default) - { - var setting = Container.TryGetSetting(id); - - if (setting != null) + catch (Exception ex) { - if (setting.Type != SettingType.Float) Debug.LogWarning($"Тип настройки {id} не соответсвует float"); - return setting.FloatValue; - } - else - { - return _default; + Debug.LogError($"Error cloning settings scheme: {ex.Message}"); + return null; } } - public static string GetString(string id, string _default) + // Вспомогательный метод для копирования группы + private static SettingsGroupDTO CopyGroupStructure(SettingsGroupDTO source) { - var setting = Container.TryGetSetting(id); + if (source == null) return null; - if (setting != null) + try { - if (setting.Type != SettingType.String) Debug.LogWarning($"Тип настройки {id} не соответсвует string"); - return setting.StringValue; + var group = new SettingsGroupDTO(); + group.Name = source.Name; + group.IconPath = source.IconPath; + group.Settings = new List(); + + if (source.Settings != null) + { + foreach (var setting in source.Settings) + { + if (setting != null) + { + var settingClone = CopySettingStructure(setting); + if (settingClone != null) + { + group.Settings.Add(settingClone); + } + } + } + } + + return group; + } + catch (Exception ex) + { + Debug.LogError($"Error copying group {source?.Name}: {ex.Message}"); + return null; + } + } + + private static SettingDTO CopySettingValue(SettingDTO source, SettingDTO targetTemplate) + { + var newSetting = new SettingDTO(); + + // Копируем структуру из шаблона + newSetting.Type = targetTemplate.Type; + newSetting.Id = targetTemplate.Id; + newSetting.Alias = targetTemplate.Alias; + newSetting.Description = targetTemplate.Description; + newSetting.IntMin = targetTemplate.IntMin; + newSetting.IntMax = targetTemplate.IntMax; + newSetting.IntStep = targetTemplate.IntStep; + newSetting.FloatMin = targetTemplate.FloatMin; + newSetting.FloatMax = targetTemplate.FloatMax; + newSetting.FloatStep = targetTemplate.FloatStep; + + if (targetTemplate.AllowedValues != null) + { + newSetting.AllowedValues = new List(targetTemplate.AllowedValues); } - return _default; - } - - private static string GetSettingsHash(List settings) - { - StringBuilder sb = new(); - foreach (Setting setting in settings) + // Копируем значение из source + switch (targetTemplate.Type) { - sb.Append(setting.Id); - sb.Append(setting.Alias); - sb.Append(setting.Group); - sb.Append(setting.Type); + case Setting.SettingType.Bool: + newSetting.BoolValue = source.BoolValue; + break; + case Setting.SettingType.Int: + newSetting.IntValue = Mathf.Clamp(source.IntValue, targetTemplate.IntMin, targetTemplate.IntMax); + break; + case Setting.SettingType.Float: + newSetting.FloatValue = Mathf.Clamp(source.FloatValue, targetTemplate.FloatMin, targetTemplate.FloatMax); + break; + case Setting.SettingType.String: + if (targetTemplate.AllowedValues != null && targetTemplate.AllowedValues.Contains(source.StringValue)) + { + newSetting.StringValue = source.StringValue; + } + else + { + newSetting.StringValue = targetTemplate.StringValue; + } + break; + case Setting.SettingType.Signal: + newSetting.SignalValue = targetTemplate.SignalValue; + break; } - byte[] inputBytes = Encoding.UTF8.GetBytes(sb.ToString()); - using MD5 md5 = MD5.Create(); - byte[] hashBytes = md5.ComputeHash(inputBytes); - - return Encoding.UTF8.GetString(hashBytes); + return newSetting; } - public static void SaveContainerToFile() + private static SettingDTO CopySettingStructure(SettingDTO template) { - SettingDataWrapper dataWrapper = new SettingDataWrapper(Container.Settings); - string json = JsonUtility.ToJson(dataWrapper); - string jsonEnc = CryptoUtil.EncryptJson(json, "RR_SeTtInGs"); - File.WriteAllText(SETTINGS_FILE_PATH, jsonEnc); - } + var newSetting = new SettingDTO(); - private static void SaveContainerToFile(SettingsContainer container) - { - SettingDataWrapper dataWrapper = new SettingDataWrapper(container.Settings); - string json = JsonUtility.ToJson(dataWrapper, true); - string jsonEnc = CryptoUtil.EncryptJson(json, "RR_SeTtInGs"); - File.WriteAllText(SETTINGS_FILE_PATH, jsonEnc); - } + newSetting.Type = template.Type; + newSetting.Id = template.Id; + newSetting.Alias = template.Alias; + newSetting.Description = template.Description; + newSetting.IntMin = template.IntMin; + newSetting.IntMax = template.IntMax; + newSetting.IntStep = template.IntStep; + newSetting.FloatMin = template.FloatMin; + newSetting.FloatMax = template.FloatMax; + newSetting.FloatStep = template.FloatStep; + newSetting.BoolValue = template.BoolValue; + newSetting.IntValue = template.IntValue; + newSetting.FloatValue = template.FloatValue; + newSetting.StringValue = template.StringValue; + newSetting.SignalValue = template.SignalValue; - private static SettingsContainer GetContainerFromDefault() - { - SettingsContainer container = new SettingsContainer(GetDefaultSettings()); - SaveContainerToFile(container); - return container; - } - - private static SettingsContainer GetContainerFromFile() - { - string jsonEnc = File.ReadAllText(SETTINGS_FILE_PATH); - string json = CryptoUtil.DecryptJson(jsonEnc, "RR_SeTtInGs"); - SettingDataWrapper dataWrapper = JsonUtility.FromJson(json); - SettingsContainer container = new SettingsContainer(dataWrapper); - return container; - } - - private static SettingsContainer LoadContainerAuto() - { - bool shouldLoadDefault = !SettingsFileExists() || !IsSavedSettingsValid(); - return shouldLoadDefault ? GetContainerFromDefault() : GetContainerFromFile(); - } - - private static bool SettingsFileExists() - { - if (!File.Exists(SETTINGS_FILE_PATH)) + if (template.AllowedValues != null) { - Debug.LogWarning($"Файл не найден по пути: {SETTINGS_FILE_PATH}"); + newSetting.AllowedValues = new List(template.AllowedValues); + } + + return newSetting; + } + + public static void SaveSettings() + { + if (currentSchemeDTO != null) + { + FileUtil.SaveJson(SettingsFileName, SettingsPath, currentSchemeDTO); + SettingsSaved?.Invoke(); + Debug.Log("Настройки сохранены"); + } + } + #endregion + + #region Get Values + + private static T GetSetting(string id, Setting.SettingType expectedType, Func getValue) + { + if (!IsInitialized()) + throw new InvalidOperationException("Менеджер настроек не инициализирован"); + + var setting = FindSetting(id); + + if (setting == null) + throw new InvalidOperationException($"Настройка {id} не найдена"); + + if (setting.Type != expectedType) + throw new InvalidOperationException($"Настройка {id} не соответствует ожидаемому типу {expectedType}"); + + return getValue(setting); + } + + public static string GetString(string id) + => GetSetting(id, Setting.SettingType.String, s => s.StringValue); + + public static int GetInt(string id) + => GetSetting(id, Setting.SettingType.Int, s => s.IntValue); + + public static float GetFloat(string id) + => GetSetting(id, Setting.SettingType.Float, s => s.FloatValue); + + public static bool GetBool(string id) + => GetSetting(id, Setting.SettingType.Bool, s => s.BoolValue); + + #endregion + + #region Private Helpers + private static bool IsInitialized() + { + if (currentSchemeDTO == null) + { + Debug.LogError("SettingsManager not initialized! Call Initialize() first."); return false; } - return true; } - private static bool IsSavedSettingsValid() + private static SettingDTO FindSetting(string id) { - string savedHash = GetSettingsHash(GetContainerFromFile().Settings); - string defaultHash = GetSettingsHash(GetDefaultSettings()); + foreach (var group in currentSchemeDTO.groups) + { + if (group?.Settings == null) continue; - bool valid = string.Equals(savedHash, defaultHash); - return valid; - } - - private static List GetDefaultSettings() - { - var settings = new List(); - settings.Add(new Setting(id: "MusicVolume", - alias: "Громкость музыки", - group: "Звук и озвучка", - type: SettingType.Float, - cycling: false, - value: 0.5f, - min: 0f, - max: 1f, - step: 0.01f)); - - settings.Add(new Setting(id: "SoundsVolume", - alias: "Громкость эффектов и голоса", - group: "Звук и озвучка", - type: SettingType.Float, - cycling: false, - value: 0.5f, - min: 0f, - max: 1f, - step: 0.01f)); - - settings.Add(new Setting(id: "PromoVolume", - alias: "Громкость промо ролика", - group: "Звук и озвучка", - type: SettingType.Float, - cycling: false, - value: 0.5f, - min: 0f, - max: 1f, - step: 0.01f)); - - settings.Add(new Setting(id: "Prizing", - alias: "Выдача призов при игре с ботом", - group: "Игровой процесс", - type: SettingType.Bool, - cycling: false, - value: true)); - - settings.Add(new Setting(id: "EnableVoices", - alias: "Голосовые реплики", - group: "Звук и озвучка", - type: SettingType.Bool, - cycling: false, - value: true)); - - settings.Add(new Setting(id: "Difficulty", - alias: "Сложность ботов", - group: "Игровой процесс", - type: SettingType.String, - cycling: false, - value: "Средняя", - allowedValues: new() { "Легкая", "Средняя", "Сложная" })); - - settings.Add(new Setting(id: "Freeplay", - alias: "Бесплатная игра", - group: "Оплата и цены", - type: SettingType.Bool, - cycling: false, - value: false)); - - settings.Add(new Setting(id: "ShowNumber", - alias: "Показывать контакты администрации", - group: "Контакты и поддержка", - type: SettingType.Bool, - cycling: false, - value: true)); - - settings.Add(new Setting(id: "FastCheck", - alias: "Быстрая проверка счетчиков", - group: "Быстрые проверки", - type: SettingType.Bool, - cycling: false, - value: true)); - - settings.Add(new Setting(id: "FastCheckPrizes", - alias: "Быстрая проверка призов", - group: "Быстрые проверки", - type: SettingType.Bool, - cycling: false, - value: true)); - settings.Add(new Setting(id: "PrizingWhenError", - alias: "Выдавать приз при ошибке", - group: "Призы и выдача", - type: SettingType.Bool, - cycling: false, - value: true)); - - settings.Add(new Setting(id: "DisplayPrizingError", - alias: "Вывод ошибки выдачи в меню", - group: "Призы и выдача", - type: SettingType.Bool, - cycling: false, - value: true)); - - //от 25.12.2025 - settings.Add(new Setting(id: "BaseBotDifficulty", - alias: "Текущая сложность аппарата", - group: "Игровой процесс", - type: SettingType.String, - cycling: false, - value: "Повышенная", - allowedValues: new() { "Обычная", "Повышенная", "Фиксированная" })); - - //от 26.12.2025 - settings.Add(new Setting(id: "DisplayNoPrizes", - alias: "Выводить призы закончились", - group: "Призы и выдача", - type: SettingType.Bool, - cycling: false, - value: false)); - //от 16.01.2026 - settings.Add(new Setting(id: "PasswordOnSettings", - alias: "Вход в настройки по паролю", - group: "Сервис", - type: SettingType.Bool, - cycling: false, - value: false)); - - settings.Add(new Setting(id: "TakeOrRisk", - alias: "Забрать или рискнуть", - group: "Призы и выдача", - type: SettingType.Bool, - cycling: false, - value: true)); - - - return settings; + foreach (var setting in group.Settings) + { + if (setting != null && setting.Id == id) + { + return setting; + } + } + } + + Debug.LogWarning($"Setting not found: {id}"); + return null; } + #endregion } \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingsManager.cs.meta b/Assets/Scripts/Settings/SettingsManager.cs.meta index a3d1d26..baad750 100644 --- a/Assets/Scripts/Settings/SettingsManager.cs.meta +++ b/Assets/Scripts/Settings/SettingsManager.cs.meta @@ -1,11 +1,2 @@ fileFormatVersion: 2 -guid: 896b3b244e3f8db4c8a6f4591ca9c68f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: -60 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +guid: 896b3b244e3f8db4c8a6f4591ca9c68f \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingsManagerConfig.cs b/Assets/Scripts/Settings/SettingsManagerConfig.cs new file mode 100644 index 0000000..1115e4d --- /dev/null +++ b/Assets/Scripts/Settings/SettingsManagerConfig.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "SettingsManagerConfig", menuName = "Создание конфигов/Менеджер настроек")] +public class SettingsManagerConfig : ScriptableObject +{ + public SettingsScheme DefaultSettingsScheme; +} diff --git a/Assets/Scripts/Settings/SettingsManagerConfig.cs.meta b/Assets/Scripts/Settings/SettingsManagerConfig.cs.meta new file mode 100644 index 0000000..c1a4689 --- /dev/null +++ b/Assets/Scripts/Settings/SettingsManagerConfig.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2a55b2639f5bfc54da98f80f9640c817 \ No newline at end of file diff --git a/Assets/Scripts/Settings/SettingsScreen.cs b/Assets/Scripts/Settings/SettingsScreen.cs index 25a59b3..cd3264c 100644 --- a/Assets/Scripts/Settings/SettingsScreen.cs +++ b/Assets/Scripts/Settings/SettingsScreen.cs @@ -1,439 +1,185 @@ using System.Collections.Generic; -using System.Data; -using System.Linq; -using TMPro; using UnityEngine; +using UnityEngine.UI; public class SettingsScreen : MonoBehaviour { - [SerializeField] RectTransform pointer; - public List settingActions; - private List settings; + [Header("Управление")] + [SerializeField] private InSignal NextSetting; + [SerializeField] private InSignal PreviousSetting; + [SerializeField] private InSignal ChangeSettingPositive; + [SerializeField] private InSignal ChangeSettingNegative; + private bool controlsEnabled = true; + private bool readyToGetInput = false; - [SerializeField] private List excludedIds; - - Dictionary groups; - List groupsOrder; - List actionItems; - - int currentGroupIndex = 0; - int currentItemIndex = 0; - - SettingItem activeSettingItem; - - public ViewPrefabsProvider viewProvider; - - [Header("Настройки генерации")] - [SerializeField] private RectTransform SettingsContent; - [SerializeField] private Vector2 GeneralOffset; - [SerializeField] private GameObject GroupHeaderPrefab; - [SerializeField] private float GroupHeaderLeftMargin = 0; - - [SerializeField] private GameObject GroupItemPrefab; - [SerializeField] private float GroupItemLeftMargin = 20; - [SerializeField] private Vector2 pointerOffset = new Vector2(-40, -25); - - [Header("Описания настроек")] - public Transform DescriptionContainer; - public SettingDescriptionProvider DescriptionProvider; - public HeaderIconsProvider IconsProvider; - private GameObject CurrentDescription; + [Header("Ссылки")] + [SerializeField] private SettingGroupView GroupViewPrefab; + [SerializeField] private RectTransform pointer; + [SerializeField] private ScrollRect scrollRect; + [SerializeField] private RectTransform Content; [Header("Настройки scroll view")] - float minScrollY = 0; - Vector2 scrollVelocity = Vector2.zero; + [SerializeField] private float scrollSmoothTime = 0.2f; - public AudioClip clip; + private int interactionDirection = 0; + private SettingView SelectedSetting => settingsGroups[activeGroup].GeneratedSettingViews[activeSetting]; + + private bool Generated = false; + private int activeGroup; + private int activeSetting; + private List settingsGroups; + + // Для плавного скролла + private float targetVerticalPosition = 0f; + private float scrollVelocity = 0f; + private bool isFirstFrame = true; - bool Generated = false; - private void OnEnable() - { - Generate(); - SetupActiveItem(); - RefreshViews(); - } private void Update() { if (!Generated) return; - Controls(); - - Vector2 targetContentPosition = new Vector2(0, ContentYPos(activeSettingItem.ItemRect.anchoredPosition.y)); - - - SettingsContent.anchoredPosition = Vector2.SmoothDamp(current: SettingsContent.anchoredPosition, - target: targetContentPosition, - currentVelocity: ref scrollVelocity, - smoothTime: 0.1f); - - - foreach (SettingItem action in actionItems) + if (isFirstFrame) { - action.ActionUpdate(); + isFirstFrame = false; + scrollRect.verticalNormalizedPosition = 1f; + UpdateScrollTarget(); + return; } - - } - private void Controls() + + private void LateUpdate() { - int direction = 0; - if (In.GetButtonAnyPlayer(PlayerAction.left)) direction -= 1; - if (In.GetButtonAnyPlayer(PlayerAction.right)) direction += 1; - - if (direction != 0) + if (controlsEnabled && readyToGetInput) { - activeSettingItem.Interact(direction); - - + SelectedSetting.InteractView(interactionDirection); } - bool changeItem = In.GetButtonDown(ButtonPinMapping.down1); - bool changeGroup = In.GetButtonDown(ButtonPinMapping.down2); - - if (changeItem) - { - string currentGroup = groupsOrder[currentGroupIndex]; - int ItemsCount = groups[currentGroup].Items.Count; - - currentItemIndex = (currentItemIndex + 1) % ItemsCount; - } - if (changeGroup) - { - currentGroupIndex = (currentGroupIndex + 1 + groupsOrder.Count) % groupsOrder.Count; - currentItemIndex = 0; - } - - if (changeItem || changeGroup) - { - SetupActiveItem(); - SoundManager.instance.playClip(clip); - } + SmoothScrollToSelected(); + DisplayPointer(); + interactionDirection = 0; } - private float ContentYPos(float itemY) + public void _ChangeInteractionDirection(int delta) => interactionDirection += delta; + public void EnableControls() => controlsEnabled = true; + public void DisableControls() => controlsEnabled = false; + public void SetReadyToGetInput() => readyToGetInput = true; + + public void Generate() { - float baseOffset = -350f;//вынести в поле - float contentPos = baseOffset + Mathf.Abs(itemY); - contentPos = Mathf.Max(contentPos, minScrollY); - - return contentPos; - } - - void SetupActiveItem() - { - string groupName = groupsOrder[currentGroupIndex]; - Group group = groups[groupName]; - SettingItem item = group.Items[currentItemIndex]; - - activeSettingItem = item; - pointer.anchoredPosition = item.ItemRect.anchoredPosition + pointerOffset; - - if (CurrentDescription != null) Destroy(CurrentDescription); - CurrentDescription = Instantiate(DescriptionProvider.GetDescription(item.GetID()), DescriptionContainer); - } - - public void RefreshViews() - { - if (!Generated) return; - foreach (var group in groupsOrder) + // Очищаем старые группы + if (settingsGroups != null) { - foreach (SettingItem item in groups[group].Items) + foreach (var group in settingsGroups) { - item.RefreshView(); + if (group != null) + Destroy(group.gameObject); } } - } - private void Generate() - { - if (Generated) return; - settings = SettingsManager.Container.Settings; - groupsOrder = new List(); - groups = new Dictionary(); - actionItems = new(); - viewProvider.Initialize(); - List groupNames = GetGroupNames(settings, settingActions); + settingsGroups = new List(); - //создаю группы. - foreach (string groupName in groupNames) + foreach (var group in SettingsManager.currentSchemeDTO.groups) { - List groupSettings = GetSettingsByGroup(settings, groupName); - List groupActions = GetActionsByGroup(settingActions, groupName); - if (AllGroupItemsExcluded(groupSettings, groupActions)) continue; - - var group = new Group(); - - //заполнить Items - foreach (Setting setting in groupSettings) - { - if (IsExcludedId(setting.Id)) continue; - - SettingItem item = new SettingItem(setting); - group.Items.Add(item); - - } - foreach (SettingAction action in groupActions) - { - if (IsExcludedId(action.Name)) continue; - - SettingItem item = new SettingItem(action); - actionItems.Add(item); - group.Items.Add(item); - } - - groupsOrder.Add(groupName); - groups.Add(groupName, group); + var generatedGroup = GenerateGroup(group); + settingsGroups.Add(generatedGroup); } - //генерит вьюхи - float NextYPosition = GeneralOffset.y; - foreach (string groupName in groupsOrder) - { - //Заголовок группы - Vector2 anchoredPosition = new Vector2(GeneralOffset.x + GroupHeaderLeftMargin, NextYPosition); - GenerateHeader(prefab: GroupHeaderPrefab, - parent: SettingsContent, - anchoredPosition: anchoredPosition, - text: groupName, - NextYPosition: ref NextYPosition); - - //Элементы группы - foreach (var item in groups[groupName].Items) - { - anchoredPosition = new Vector2(GeneralOffset.x + GroupItemLeftMargin, NextYPosition); - //item.SetView(viewProvider.GetViewPrefab(setting.Id)); - GenerateItem(prefab: GroupItemPrefab, - parent: SettingsContent, - Item: item, - anchoredPosition: anchoredPosition, - NextYPosition: ref NextYPosition); - } - } + activeGroup = 0; + activeSetting = 0; Generated = true; } - private bool IsExcludedId(string id) => excludedIds.Contains(id); - - /// - /// Определяет есть ли в группе хоть один неисключенный элемент - /// - /// Настройки группы - /// Действия группы - /// - private bool AllGroupItemsExcluded(List settings, List actions) + public void SwitchItem(int direction) { - foreach (var item in settings) + if (direction == 0 || !controlsEnabled) return; + + activeSetting += direction; + SettingGroupView currentGroup = settingsGroups[activeGroup]; + + //Выход за пределы группы (верхний предел) + if (activeSetting > currentGroup.GeneratedSettingViews.Count - 1) { - if (!excludedIds.Contains(item.Id)) return false; + activeGroup = (activeGroup + 1 + settingsGroups.Count) % settingsGroups.Count; + activeSetting = 0; } - foreach (var item in actions) + //Выход за пределы группы (нижний предел) + else if (activeSetting < 0) { - if (!excludedIds.Contains(item.Name)) return false; + activeGroup = (activeGroup - 1 + settingsGroups.Count) % settingsGroups.Count; + activeSetting = settingsGroups[activeGroup].GeneratedSettingViews.Count - 1; } - return true; + + UpdateScrollTarget(); } - private List GetGroupNames(List settings, List actions) + private void DisplayPointer() { - // HashSet обеспечивает O(1) для Contains - var uniqueNames = new HashSet(); - - foreach (var setting in settings) - { - if (!string.IsNullOrEmpty(setting.Group)) - uniqueNames.Add(setting.Group); - } - - foreach (var action in actions) - { - if (!string.IsNullOrEmpty(action.Group)) - uniqueNames.Add(action.Group); - } - - return uniqueNames.ToList(); + pointer.SetParent(SelectedSetting.transform); + pointer.localPosition = Vector3.zero; } - private List GetSettingsByGroup(List settings, string group) + + + private SettingGroupView GenerateGroup(SettingsGroupDTO group) { - return settings - .Where(s => s.Group == group) - .ToList(); + var go = Instantiate(GroupViewPrefab.gameObject, Content); + var groupView = go.GetComponent(); + groupView.Generate(group); + return groupView; } - private List GetActionsByGroup(List actions, string group) + private void UpdateScrollTarget() { - return actions - .Where(a => a.Group == group) - .ToList(); + float targetNormalizedPosition = CalculateNormalizedPosition(); + targetVerticalPosition = targetNormalizedPosition; + } - private void GenerateHeader(GameObject prefab, RectTransform parent, Vector2 anchoredPosition, string text, ref float NextYPosition) + private float CalculateNormalizedPosition() { - RectTransform groupHeaderRect = Instantiate(prefab, parent).GetComponent(); - TextMeshProUGUI headerLabel = groupHeaderRect.GetComponent(); + // Проверка наличия необходимых компонентов + if (scrollRect.viewport == null) + { + Debug.LogError("ScrollRect Viewport is not assigned!"); + return 0f; + } - groupHeaderRect.anchoredPosition = anchoredPosition; - NextYPosition -= groupHeaderRect.sizeDelta.y; + RectTransform selectedRect = SelectedSetting.GetComponent(); - headerLabel.text = text; + // Получаем мировые координаты углов + Vector3[] worldCorners = new Vector3[4]; + selectedRect.GetWorldCorners(worldCorners); - //Иконка - RectTransform iconRect = Instantiate(IconsProvider.GetIcon(text), parent).GetComponent(); - float headerWidth = headerLabel.GetPreferredValues().x; - iconRect.anchoredPosition = anchoredPosition + new Vector2(headerWidth + 10, 0); + // Получаем локальные координаты относительно Content + Vector3 localPos = Content.InverseTransformPoint(worldCorners[1]); // Верхний левый угол элемента + + // Вычисляем нормализованную позицию (0 = вверху, 1 = внизу) + float contentHeight = Content.rect.height; + float viewportHeight = scrollRect.viewport.rect.height; + + if (contentHeight <= viewportHeight) return 0f; + + float maxScroll = contentHeight - viewportHeight; + float scrollPosition = -localPos.y; // Инвертируем, т.к. UI координаты Y вниз + + // Центрируем элемент + float elementHeight = selectedRect.rect.height; + scrollPosition -= (viewportHeight / 2f) - (elementHeight / 2f); + + float normalizedPosition = Mathf.Clamp01(scrollPosition / maxScroll); + + return 1f - normalizedPosition; // Инвертируем для ScrollRect } - private void GenerateItem(GameObject prefab, RectTransform parent, SettingItem Item, Vector2 anchoredPosition, ref float NextYPosition) + private void SmoothScrollToSelected() { - RectTransform groupItemRect = Instantiate(prefab, parent).GetComponent(); - TextMeshProUGUI itemLabel = groupItemRect.GetComponent(); - - groupItemRect.anchoredPosition = anchoredPosition; - NextYPosition -= groupItemRect.sizeDelta.y; - - itemLabel.text = Item.GetDisplayName(); - Item.ItemRect = groupItemRect; - - Item.SetupView(viewProvider); + float currentPos = scrollRect.verticalNormalizedPosition; + float newPos = Mathf.SmoothDamp(currentPos, targetVerticalPosition, + ref scrollVelocity, scrollSmoothTime); + scrollRect.verticalNormalizedPosition = newPos; } - - #region NESTED - class Group - { - public List Items; - public Group() => Items = new(); - } - - class SettingItem - { - public SettingItemType Type; - - public RectTransform ItemRect; //Отрисованный rect. Для навигации поинтера. - - public IView view; - - private Setting setting; - private SettingAction action; - - - float timeToInvoke = 1f; - float elapsedTime = 0f; - - public float interactDelay = 0; - public float lastInteract; - - public void ActionUpdate() - { - elapsedTime = Mathf.Clamp(elapsedTime - Time.deltaTime, 0, timeToInvoke); - view?.ChangeValue((elapsedTime / timeToInvoke).ToString()); - } - public SettingItem(Setting setting) - { - this.setting = setting; - Type = SettingItemType.Setting; - - if (setting.Type == SettingType.String) interactDelay = 0.5f; - - } - - public SettingItem(SettingAction action) - { - this.action = action; - Type = SettingItemType.Action; - //вью сделать - } - - public string GetDisplayName() - { - return Type switch - { - SettingItemType.Setting => setting.Alias, - SettingItemType.Action => action.Name, - _ => "<ошибка получения имени SettingItem>" - }; - } - public string GetID() - { - return Type switch - { - SettingItemType.Setting => setting.Id, - SettingItemType.Action => action.Name, - _ => "defaultId" - }; - } - - public void Interact(int direction) - { - if (Type == SettingItemType.Setting) - { - if (Time.time - lastInteract > interactDelay) - { - SettingsManager.ChangeSetting(setting, direction); - view.ChangeValue(setting.Id); - lastInteract = Time.time; - } - - - - } - if (Type == SettingItemType.Action) - { - elapsedTime = Mathf.Clamp(elapsedTime + 2 * Time.deltaTime, 0, timeToInvoke); - if (elapsedTime >= timeToInvoke) - { - elapsedTime = 0f; - action.OnPressed?.Invoke(); - view.OnChangeReady?.Invoke(); - } - } - } - - public void SetupView(ViewPrefabsProvider viewProvider) - { - - if (Type == SettingItemType.Setting) - { - GameObject viewPrefab = viewProvider.GetViewPrefab(setting.Id); - RectTransform rect = Instantiate(viewPrefab, ItemRect).GetComponent(); - rect.anchoredPosition = ItemRect.rect.max;//тут мб другое - - view = rect.GetComponent(); - if (view == null) - Debug.LogError($"Нет вью на {viewPrefab}"); - else - view.Initialize(setting.Id); - - } - if (Type == SettingItemType.Action) - { - GameObject viewPrefab = viewProvider.GetViewPrefab("Action"); - RectTransform rect = Instantiate(viewPrefab, ItemRect).GetComponent(); - rect.anchoredPosition = ItemRect.rect.max;//тут мб другое - - view = rect.GetComponent(); - if (view == null) - Debug.LogError($"Нет вью на {viewPrefab}"); - else - view.Initialize("0"); - } - } - - public void RefreshView() - { - if (view == null) - { - print($"Вью {GetDisplayName()} null"); - return; - } - - if (Type == SettingItemType.Setting) view.Initialize(setting.Id); - else view.Initialize("0"); - } - } - enum SettingItemType { Setting, Action } - #endregion } \ No newline at end of file diff --git a/Assets/Scripts/Settings/TextInput.cs b/Assets/Scripts/Settings/TextInput.cs new file mode 100644 index 0000000..cc80fa7 --- /dev/null +++ b/Assets/Scripts/Settings/TextInput.cs @@ -0,0 +1,252 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public class TextInput : MonoBehaviour, ICompletable +{ + [Header("Генерация")] + [SerializeField] private GameObject _letterSlotPrefab; + [SerializeField] private RectTransform _group; + + [Header("Управление")] + [SerializeField] private InSignal _nextSlot; + [SerializeField] private InSignal _prevSlot; + [SerializeField] private InSignal _nextSymbol; + [SerializeField] private InSignal _prevSymbol; + [SerializeField] private List _exitSignals; + [SerializeField] private float _timeToExit = 2; + + [Header("Ключ prefs")] + [SerializeField] private string key; + [SerializeField] private bool loadData; + [SerializeField] private bool saveDataOnClose; + + [Header("Настройки генерации поля")] + [SerializeField] private int slotsCount = 11; + + [Header("Звуки")] + [SerializeField] private AudioClip switchSlotSound; + [SerializeField] private AudioClip switchLetterSound; + [SerializeField] private AudioClip acceptSound; + [SerializeField] private AudioClip openSound; + + [Header("Алфавит")] + [SerializeField] private string alphabetString = "0123456789"; + + [Header("Скорость переключения букв")] + [SerializeField] private float MaxSpeedLetterPerSecond = 8; + [SerializeField] private float MinSpeedLetterPerSecond = 3; + [SerializeField] private float MaxSpeedTime = 3; + [SerializeField] private float MinSpeedTime = 0.5f; + + [SerializeField] + + private float switchButtonPressedTime = 0; + private float letterSwitchSpeed = 0; + private float switchDelayRest = 1; + + private int _slotIndex = 0; + private float exitTimer = 0; + + private LetterSlot[] _slots; + + public event Action OnComplete; + + private LetterSlot _activeSlot => _slots[_slotIndex]; + + private bool exitRequested = false; + private bool ready; + + + public void Initialize() + { + Generate(); + LoadSavedData(); + } + + private void OnEnable() + { + ready = false; + } + + private void Update()//условия завершения добавить + { + if (!ready) + { + ready = !(In.GetButton(_nextSlot) || In.GetButton(_prevSlot) || In.GetButton(_nextSymbol) || In.GetButton(_prevSymbol)); + return; + } + + + if (exitRequested) + { + exitTimer = 0; + exitRequested = false; + + Exit(); + return; + } + + int dir = 0; + if (In.GetButtonDown(_nextSlot)) dir += 1; + if (In.GetButtonDown(_prevSlot)) dir -= 1; + SwitchSlot(dir); + + dir = 0; + if (In.GetButton(_nextSymbol)) dir += 1; + if (In.GetButton(_prevSymbol)) dir -= 1; + SwitchLetter(dir); + + if (ExitCombinationPressed()) + { + exitTimer += Time.deltaTime; + } + else + { + exitTimer -= Time.deltaTime; + } + exitTimer = Mathf.Clamp(exitTimer, 0f, _timeToExit); + + exitRequested = exitTimer >= _timeToExit; + } + + private void Exit() + { + SaveAndClose(); + OnComplete?.Invoke(); + gameObject.SetActive(false); + } + public string SaveAndClose() + { + string result = GetText(); + + if (!string.IsNullOrEmpty(key) && saveDataOnClose) + { + PlayerPrefs.SetString(key, result); + } + + Clear(); + + return result; + + } + private void Generate() + { + _slots = new LetterSlot[slotsCount]; + for (int i = 0; i < slotsCount; i++) + { + var go = Instantiate(_letterSlotPrefab.gameObject, _group); + _slots[i] = go.GetComponent(); + _slots[i].Init(alphabetString[0], false); + } + _slotIndex = 0; + _slots[0].SetSelected(true); + + } + private void LoadSavedData()//Тут надо проработать + { + string data = ""; + + if (loadData) + data = PlayerPrefs.GetString(key, ""); + + // Очищаем все слоты + for (int i = 0; i < slotsCount; i++) + { + _slots[i].SetSymbol(alphabetString[0]); + } + + if (!string.IsNullOrEmpty(data)) + { + int minLength = Mathf.Min(data.Length, slotsCount); + for (int i = 0; i < minLength; i++) + { + _slots[i].SetSymbol(data[i]); + } + } + } + + public void SwitchSlot(int discreteDirection) + { + if (discreteDirection == 0) return; + + _activeSlot.SetSelected(false); + ChangeIndexBounded(ref _slotIndex, delta: discreteDirection, length: slotsCount); + _activeSlot.SetSelected(true); + } + + public void SwitchLetter(int continiousDirection) + { + continiousDirection = Mathf.Clamp(continiousDirection, -1, 1); + if (continiousDirection == 0)//сброс переключения + { + switchDelayRest = 0; + switchButtonPressedTime = 0; + return; + } + + if (switchDelayRest < 0) + { + //переключение + int currentLetterindex = getSymbolIndex(_activeSlot.GetSymbol(), alphabetString); + ChangeIndexLooped(ref currentLetterindex, delta: continiousDirection, alphabetString.Length); + _activeSlot.SetSymbol(alphabetString[currentLetterindex]); + + recalculateRest(); + } + switchDelayRest -= Time.deltaTime; + switchButtonPressedTime += Time.deltaTime; + + + void recalculateRest() + { + float k = (MaxSpeedLetterPerSecond - MinSpeedLetterPerSecond) + / (MaxSpeedTime - MinSpeedTime); + float b = MinSpeedLetterPerSecond - k * MinSpeedTime; + letterSwitchSpeed = k * switchButtonPressedTime + b; + letterSwitchSpeed = Mathf.Clamp(letterSwitchSpeed, + MinSpeedLetterPerSecond, + MaxSpeedLetterPerSecond); + switchDelayRest = 1 / letterSwitchSpeed; + } + + int getSymbolIndex(char symbol, string alphabet) => alphabet.IndexOf(symbol); + } + + + public void Clear() + { + foreach (var slot in _slots) + { + Destroy(slot.gameObject); + } + _slots = null; + } + + public string GetText() + { + System.Text.StringBuilder sb = new(); + foreach (var slot in _slots) + sb.Append(slot.GetSymbol()); + return sb.ToString().Trim(); + } + + private + + static void ChangeIndexLooped(ref int index, int delta, int length) + => index = (index + delta + length) % length; + + static void ChangeIndexBounded(ref int index, int delta, int length) + => index = Mathf.Clamp(index + delta, 0, length - 1); + + private bool ExitCombinationPressed() + { + foreach (var signal in _exitSignals) + { + if (In.GetButton(signal) == false) + return false; + } + return true; + } + +} diff --git a/Assets/Scripts/Settings/TextInput.cs.meta b/Assets/Scripts/Settings/TextInput.cs.meta new file mode 100644 index 0000000..0b81f26 --- /dev/null +++ b/Assets/Scripts/Settings/TextInput.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b978a8958dc9290419c3d1a666131860 \ No newline at end of file diff --git a/Assets/Scripts/Settings/TitleIcons.meta b/Assets/Scripts/Settings/TitleIcons.meta deleted file mode 100644 index 78b9add..0000000 --- a/Assets/Scripts/Settings/TitleIcons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b74170f57c87b374a87cdf31f6e1ec63 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab b/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab deleted file mode 100644 index 86ddfde..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -1669548024504761060} - m_Layer: 5 - m_Name: "\u0411\u044B\u0441\u0442\u0440\u044B\u0435 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-1669548024504761060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c98e9e36fae87c442bd00e1de5603cad, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab.meta deleted file mode 100644 index 8027186..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Быстрые проверки.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0b9f0a29b8a151e4f888f18088a1c3f7 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab b/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab deleted file mode 100644 index c62eec3..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -4776953818289919260} - m_Layer: 5 - m_Name: "\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-4776953818289919260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd7f10f43d4a12248b458ddcc27d51f3, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab.meta deleted file mode 100644 index 31cf761..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Диагностика устройства.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7f1684113a3a02f48837a8971caba539 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png b/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png deleted file mode 100644 index 8e45ee3..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png.meta b/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png.meta deleted file mode 100644 index acd44f3..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: 69fe5a29aad2c45459b8fcaa902a77b8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab b/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab deleted file mode 100644 index e523619..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -6276758907568698884} - m_Layer: 5 - m_Name: "\u0417\u0432\u0443\u043A \u0438 \u043E\u0437\u0432\u0443\u0447\u043A\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-6276758907568698884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 69fe5a29aad2c45459b8fcaa902a77b8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab.meta deleted file mode 100644 index 117cccb..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Звук и озвучка.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6a203a6c76d3552458009d445b1430e5 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png b/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png deleted file mode 100644 index 1030695..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png.meta b/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png.meta deleted file mode 100644 index 69ec85c..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: 854606fcde05a8a4bba04e9f712d5950 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab b/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab deleted file mode 100644 index 4df2cce..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: 5320787243251603364} - m_Layer: 5 - m_Name: "\u0418\u0433\u0440\u043E\u0432\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &5320787243251603364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 854606fcde05a8a4bba04e9f712d5950, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab.meta deleted file mode 100644 index 064cade..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Игровой процесс.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: eace0e3ffa7885346a5f8c8f35cf60fb -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab b/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab deleted file mode 100644 index 89a96ad..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: 1057278672536827622} - m_Layer: 5 - m_Name: "\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &1057278672536827622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: db6c222651b304f4b95c36b155b094a1, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab.meta deleted file mode 100644 index 2986d02..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Контакты и поддержка.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f8e814752c041ee4e81c0f049dc2b8ad -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab b/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab deleted file mode 100644 index 6060eb1..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -529334834906386293} - m_Layer: 5 - m_Name: "\u041E\u043F\u043B\u0430\u0442\u0430 \u0438 \u0446\u0435\u043D\u044B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-529334834906386293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9bc2842d0f04a8a49988b12ad20898b4, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab.meta deleted file mode 100644 index 865fced..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Оплата и цены.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d6472c1b4d161314898b377a64253c57 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Оплата.png b/Assets/Scripts/Settings/TitleIcons/Оплата.png deleted file mode 100644 index 3bc67c0..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Оплата.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Оплата.png.meta b/Assets/Scripts/Settings/TitleIcons/Оплата.png.meta deleted file mode 100644 index 5652024..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Оплата.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: 9bc2842d0f04a8a49988b12ad20898b4 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Параметры.png b/Assets/Scripts/Settings/TitleIcons/Параметры.png deleted file mode 100644 index 57c2cde..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Параметры.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Параметры.png.meta b/Assets/Scripts/Settings/TitleIcons/Параметры.png.meta deleted file mode 100644 index 2a5b926..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Параметры.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: 1929b2e216b6fe343a9b5a8ca0915515 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Приз.png b/Assets/Scripts/Settings/TitleIcons/Приз.png deleted file mode 100644 index 26760aa..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Приз.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Приз.png.meta b/Assets/Scripts/Settings/TitleIcons/Приз.png.meta deleted file mode 100644 index f59feff..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Приз.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: b2a4c6b78ab40524db16b1125499f302 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab b/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab deleted file mode 100644 index 774106c..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -6142618182040743603} - m_Layer: 5 - m_Name: "\u041F\u0440\u0438\u0437\u044B \u0438 \u0432\u044B\u0434\u0430\u0447\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-6142618182040743603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b2a4c6b78ab40524db16b1125499f302, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab.meta deleted file mode 100644 index 3fb4e20..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Призы и выдача.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4de5e8c413469c449bedbd39f074110c -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Сложность.png b/Assets/Scripts/Settings/TitleIcons/Сложность.png deleted file mode 100644 index 8539cbb..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Сложность.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Сложность.png.meta b/Assets/Scripts/Settings/TitleIcons/Сложность.png.meta deleted file mode 100644 index 2367bf3..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Сложность.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: c84fb3f324e85c948bd75730b024c577 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab b/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab deleted file mode 100644 index ccf0f7c..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: 8225528880303528877} - m_Layer: 5 - m_Name: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A\u0438 \u0438 \u0441\u0431\u0440\u043E\u0441\u044B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &8225528880303528877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c98e9e36fae87c442bd00e1de5603cad, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab.meta b/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab.meta deleted file mode 100644 index 231052a..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Счетчики и сбросы.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a728c96cb10ae5c42901b45e76a8ccba -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/Техподдержка.png b/Assets/Scripts/Settings/TitleIcons/Техподдержка.png deleted file mode 100644 index 28086c9..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/Техподдержка.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/Техподдержка.png.meta b/Assets/Scripts/Settings/TitleIcons/Техподдержка.png.meta deleted file mode 100644 index b07ffbd..0000000 --- a/Assets/Scripts/Settings/TitleIcons/Техподдержка.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: db6c222651b304f4b95c36b155b094a1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/быстрая провера.png b/Assets/Scripts/Settings/TitleIcons/быстрая провера.png deleted file mode 100644 index 9dcf183..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/быстрая провера.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/быстрая провера.png.meta b/Assets/Scripts/Settings/TitleIcons/быстрая провера.png.meta deleted file mode 100644 index 60256b8..0000000 --- a/Assets/Scripts/Settings/TitleIcons/быстрая провера.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: c98e9e36fae87c442bd00e1de5603cad -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab b/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab deleted file mode 100644 index 1fc6271..0000000 --- a/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4694825826381118814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1856242640539414942} - - component: {fileID: 4462460912188239392} - - component: {fileID: -5100347000588322149} - m_Layer: 5 - m_Name: "\u0434\u0435\u0444\u043E\u043B\u0442 \u0438\u043A\u043E\u043D\u043A\u0430" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1856242640539414942 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4462460912188239392 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_CullTransparentMesh: 1 ---- !u!114 &-5100347000588322149 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4694825826381118814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -586566806, guid: 8b52ebc6fd45dde49a9cd603177ac97a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab.meta b/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab.meta deleted file mode 100644 index 2fb4024..0000000 --- a/Assets/Scripts/Settings/TitleIcons/дефолт иконка.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 612cb682b003c2e47b1b19691392af69 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/TitleIcons/диагностика.png b/Assets/Scripts/Settings/TitleIcons/диагностика.png deleted file mode 100644 index 5894f27..0000000 Binary files a/Assets/Scripts/Settings/TitleIcons/диагностика.png and /dev/null differ diff --git a/Assets/Scripts/Settings/TitleIcons/диагностика.png.meta b/Assets/Scripts/Settings/TitleIcons/диагностика.png.meta deleted file mode 100644 index ad9970c..0000000 --- a/Assets/Scripts/Settings/TitleIcons/диагностика.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: cd7f10f43d4a12248b458ddcc27d51f3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ActionView.cs b/Assets/Scripts/Settings/Views/ActionView.cs deleted file mode 100644 index db8f20e..0000000 --- a/Assets/Scripts/Settings/Views/ActionView.cs +++ /dev/null @@ -1,55 +0,0 @@ -using UnityEngine; -using UnityEngine.Events; -using UnityEngine.UI; - -public class ActionView :MonoBehaviour, IView -{ - public Image timerImage; - - public float volumeMax; - public AudioSource source; - public AudioClip readyClip; - public UnityEvent OnChangeReady { get; private set; } - - public void ChangeValue(string precent) - { - float value = float.Parse(precent); - - timerImage.transform.localScale = Vector2.one * value; - - source.volume = volumeMax * value; - source.pitch = 0.5f + 3.5f * value; - if(value > 0) - { - if (!source.isPlaying) - { - source.Play(); - } - } - else - { - source.Stop(); - } - - } - - public void Initialize(string precent) - { - SetVolume(); - SettingsManager.OnSettingsChanged.AddListener(SetVolume); - - OnChangeReady ??= new(); - OnChangeReady.AddListener(ReadySound); - - ChangeValue(precent); - } - - void SetVolume() - { - volumeMax = SettingsManager.GetFloat("SoundsVolume", 0.5f); - } - void ReadySound() - { - SoundManager.instance.playClip(readyClip); - } -} diff --git a/Assets/Scripts/Settings/Views/ActionView.cs.meta b/Assets/Scripts/Settings/Views/ActionView.cs.meta deleted file mode 100644 index 1fb88a3..0000000 --- a/Assets/Scripts/Settings/Views/ActionView.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5baff6e557d0429469559fc7b7c78a62 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ActionView.prefab b/Assets/Scripts/Settings/Views/ActionView.prefab deleted file mode 100644 index 5c3033e..0000000 --- a/Assets/Scripts/Settings/Views/ActionView.prefab +++ /dev/null @@ -1,303 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1773822908357242582 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7125800301971794603} - - component: {fileID: 3177380680555031151} - - component: {fileID: 133251437282092763} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7125800301971794603 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773822908357242582} - 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: 320135965418870523} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 25, y: 0} - m_SizeDelta: {x: 38, y: 38} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3177380680555031151 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773822908357242582} - m_CullTransparentMesh: 1 ---- !u!114 &133251437282092763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773822908357242582} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0dfe5d9c522efda49b6c41dd260adc54, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1804015508813908771 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 320135965418870523} - - component: {fileID: -1002910551614477194} - - component: {fileID: 7910073943354736099} - m_Layer: 5 - m_Name: ActionView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &320135965418870523 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804015508813908771} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7125800301971794603} - - {fileID: 189754310808106676} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 550, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &-1002910551614477194 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804015508813908771} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5baff6e557d0429469559fc7b7c78a62, type: 3} - m_Name: - m_EditorClassIdentifier: - timerImage: {fileID: 1745680456500201413} - volumeMax: 0 - source: {fileID: 7910073943354736099} - readyClip: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} ---- !u!82 &7910073943354736099 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804015508813908771} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 548caa46227f86a4f929dd8e94008645, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &3253755576503256240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 189754310808106676} - - component: {fileID: 4768346127557465275} - - component: {fileID: 1745680456500201413} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &189754310808106676 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3253755576503256240} - 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: 320135965418870523} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 25, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4768346127557465275 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3253755576503256240} - m_CullTransparentMesh: 1 ---- !u!114 &1745680456500201413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3253755576503256240} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c271a704f370a84daeb29e5a4a0aaf2, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Settings/Views/ActionView.prefab.meta b/Assets/Scripts/Settings/Views/ActionView.prefab.meta deleted file mode 100644 index 42ca3d0..0000000 --- a/Assets/Scripts/Settings/Views/ActionView.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 433c5f8525996f64298c0d7d58828797 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/BackGlow.png b/Assets/Scripts/Settings/Views/BackGlow.png deleted file mode 100644 index ea19bbb..0000000 Binary files a/Assets/Scripts/Settings/Views/BackGlow.png and /dev/null differ diff --git a/Assets/Scripts/Settings/Views/BackGlow.png.meta b/Assets/Scripts/Settings/Views/BackGlow.png.meta deleted file mode 100644 index 4317ff4..0000000 --- a/Assets/Scripts/Settings/Views/BackGlow.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: c02d3c776d32c744dafef0a03c788715 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/BoolView.cs b/Assets/Scripts/Settings/Views/BoolView.cs index f27b51f..c3384a9 100644 --- a/Assets/Scripts/Settings/Views/BoolView.cs +++ b/Assets/Scripts/Settings/Views/BoolView.cs @@ -1,98 +1,54 @@ using System.Collections; - using System.Collections.Generic; using UnityEngine; -using UnityEngine.Events; using UnityEngine.UI; -public class BoolView : MonoBehaviour, IView +public class BoolView : MonoBehaviour, ISettingView { - [SerializeField] private List ToggleGraphics; - [SerializeField] private RectTransform ToggleRect; + [Header("Layout ссылки")] + [SerializeField] GameObject EnabledImage; + [SerializeField] GameObject DisabledImage; - [SerializeField] private Color EnabledColor = new Vector4(1, 1, 1, 1); - [SerializeField] private Color DisabledColor = new Vector4(0.5f, 0.5f, 0.5f, 1); - - [SerializeField] private Vector2 EnabledPosition; - [SerializeField] private Vector2 DisabledPosition; - + [Header("Звуки")] [SerializeField] private AudioClip EnableSound; [SerializeField] private AudioClip DisableSound; - [SerializeField] private float speed = 500f; + public bool Value { get; private set; } + public SettingDTO CachedSetting { get; private set; } + + public void Initialize(SettingDTO setting) + { + this.Value = setting.BoolValue; + this.CachedSetting = setting; + Display(); + } + + public void TakeInput(int direction) + { + if (direction == 0) return; + + bool newValue = direction > 0; + if (newValue == Value) return; + + Value = newValue; + CachedSetting.BoolValue = Value; + + Display(); + } + + + private void Display() + { + EnabledImage.SetActive(Value); + DisabledImage.SetActive(!Value); + + var sound = Value ? EnableSound : DisableSound; + SoundManager.instance.playClip(sound); + } - - - bool value; - public UnityEvent OnChangeReady { get; } - - private Coroutine coroutine; - - - public void ChangeValue(string settingId) + private void OnDestroy() { - bool newValue = SettingsManager.GetBool(settingId, false); - if (newValue == value) return; - - value = newValue; StopAllCoroutines(); - StartCoroutine(Display(value, speed, sounded: true)); } - - - public void Initialize(string settingId) - { - Setting setting = SettingsManager.Container.TryGetSetting(settingId); - if (setting.Type != SettingType.Bool) - { - Debug.LogError("Настройка не того типа (bool)"); - return; - } - - this.value = setting.BoolValue; - - Vector4 targetColor = value ? EnabledColor : DisabledColor; - foreach (Graphic g in ToggleGraphics) - { - g.color = targetColor; - } - - coroutine = null; - if (coroutine == null) - coroutine = StartCoroutine(Display(this.value, 10000, sounded: false)); - - } - - IEnumerator Display(bool value, float movespeed, bool sounded) - { - Vector2 targetPosition = value ? EnabledPosition : DisabledPosition; - Vector2 startPosition = value ? DisabledPosition : EnabledPosition; - Vector4 targetColor = value ? EnabledColor : DisabledColor; - Color startColor = ToggleGraphics[0].color; - - if (sounded) - { - AudioClip clip = value ? EnableSound : DisableSound; - SoundManager.instance.playClip(clip); - } - - - while (ToggleRect.anchoredPosition != targetPosition) - { - ToggleRect.anchoredPosition = Vector2.MoveTowards(ToggleRect.anchoredPosition, targetPosition, Time.deltaTime * movespeed); - - //цвет - float t = Vector2.Distance(ToggleRect.anchoredPosition, startPosition) / Vector2.Distance(startPosition, targetPosition); - Color color = ToggleGraphics[0].color; - color = Vector4.Lerp(startColor, targetColor, t); - foreach (Graphic g in ToggleGraphics) - { - g.color = targetColor; - } - - yield return null; - } - coroutine = null; - } } diff --git a/Assets/Scripts/Settings/Views/BoolView.prefab b/Assets/Scripts/Settings/Views/BoolView.prefab deleted file mode 100644 index 69bb63f..0000000 --- a/Assets/Scripts/Settings/Views/BoolView.prefab +++ /dev/null @@ -1,818 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &408589748542759856 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 955775540420362298} - - component: {fileID: 1900545837735851201} - - component: {fileID: 2306951256697514331} - m_Layer: 5 - m_Name: Toggle.1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &955775540420362298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408589748542759856} - 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: 5550747021860642228} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1900545837735851201 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408589748542759856} - m_CullTransparentMesh: 1 ---- !u!114 &2306951256697514331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408589748542759856} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &817522614855772781 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5550747021860642228} - - component: {fileID: 1476109502590738917} - - component: {fileID: 2000579223261130949} - m_Layer: 5 - m_Name: Toggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5550747021860642228 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817522614855772781} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 955775540420362298} - m_Father: {fileID: 4403897174215019818} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 35.2, y: 35.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1476109502590738917 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817522614855772781} - m_CullTransparentMesh: 1 ---- !u!114 &2000579223261130949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817522614855772781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &850927286391343888 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1768973152808156691} - - component: {fileID: 3866312533105653996} - - component: {fileID: 6605534471617874522} - m_Layer: 5 - m_Name: square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1768973152808156691 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850927286391343888} - 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: 4403897174215019818} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3866312533105653996 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850927286391343888} - m_CullTransparentMesh: 1 ---- !u!114 &6605534471617874522 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850927286391343888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.70701414, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &982723742869787960 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6047301229565387702} - - component: {fileID: 3567759519761094716} - - component: {fileID: 5917350586597712999} - m_Layer: 5 - m_Name: square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6047301229565387702 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 982723742869787960} - 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: 841030800452235700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3567759519761094716 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 982723742869787960} - m_CullTransparentMesh: 1 ---- !u!114 &5917350586597712999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 982723742869787960} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.0627451, g: 0.0627451, b: 0.0627451, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1804015508813908771 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 320135965418870523} - - component: {fileID: 3635303621566421788} - m_Layer: 5 - m_Name: BoolView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &320135965418870523 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804015508813908771} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1550521978570498624} - - {fileID: 841030800452235700} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 550, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &3635303621566421788 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804015508813908771} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac519a1382a296149bf79e89e34c84d5, type: 3} - m_Name: - m_EditorClassIdentifier: - ToggleGraphics: - - {fileID: 6605534471617874522} - - {fileID: 3731754068017975099} - - {fileID: 7014001014006087443} - ToggleRect: {fileID: 5550747021860642228} - EnabledColor: {r: 1, g: 0.5, b: 0, a: 1} - DisabledColor: {r: 0.10188681, g: 0.051904604, b: 0, a: 1} - EnabledPosition: {x: 20, y: 0} - DisabledPosition: {x: -20, y: 0} - EnableSound: {fileID: 8300000, guid: 70982532191dd7346bf6999b59e666e3, type: 3} - DisableSound: {fileID: 8300000, guid: af069d6da1cc68847b46eaab855901ca, type: 3} - speed: 1000 ---- !u!1 &2616922182319823143 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1021277342844410039} - - component: {fileID: 4107178456892382546} - - component: {fileID: 6091033728045873184} - m_Layer: 5 - m_Name: circle right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1021277342844410039 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2616922182319823143} - 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: 841030800452235700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4107178456892382546 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2616922182319823143} - m_CullTransparentMesh: 1 ---- !u!114 &6091033728045873184 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2616922182319823143} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.0627451, g: 0.0627451, b: 0.0627451, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3933070307467925381 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1550521978570498624} - - component: {fileID: 6574870306830183016} - - component: {fileID: 5451926265383905882} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1550521978570498624 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933070307467925381} - 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: 320135965418870523} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -35, y: 0} - m_SizeDelta: {x: 85, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6574870306830183016 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933070307467925381} - m_CullTransparentMesh: 1 ---- !u!114 &5451926265383905882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933070307467925381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c02d3c776d32c744dafef0a03c788715, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4206089694472716899 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 841030800452235700} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &841030800452235700 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4206089694472716899} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6047301229565387702} - - {fileID: 6293350482530208542} - - {fileID: 1021277342844410039} - - {fileID: 4403897174215019818} - m_Father: {fileID: 320135965418870523} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!1 &4346193577679832024 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6293350482530208542} - - component: {fileID: 3212616130742921488} - - component: {fileID: 7848236792781412528} - m_Layer: 5 - m_Name: circle left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6293350482530208542 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346193577679832024} - 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: 841030800452235700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3212616130742921488 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346193577679832024} - m_CullTransparentMesh: 1 ---- !u!114 &7848236792781412528 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346193577679832024} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.0627451, g: 0.0627451, b: 0.0627451, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4370342107319042893 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2940770049958074802} - - component: {fileID: 1865193994191523092} - - component: {fileID: 7014001014006087443} - m_Layer: 5 - m_Name: circle right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2940770049958074802 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4370342107319042893} - 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: 4403897174215019818} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 35.2, y: 35.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1865193994191523092 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4370342107319042893} - m_CullTransparentMesh: 1 ---- !u!114 &7014001014006087443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4370342107319042893} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.70701414, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4538207765738626176 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2773484409040804015} - - component: {fileID: 8645456843248952914} - - component: {fileID: 3731754068017975099} - m_Layer: 5 - m_Name: circle left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2773484409040804015 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538207765738626176} - 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: 4403897174215019818} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 35.2, y: 35.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8645456843248952914 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538207765738626176} - m_CullTransparentMesh: 1 ---- !u!114 &3731754068017975099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538207765738626176} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.70701414, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6800360394217828149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4403897174215019818} - m_Layer: 5 - m_Name: Field - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4403897174215019818 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6800360394217828149} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1768973152808156691} - - {fileID: 2773484409040804015} - - {fileID: 2940770049958074802} - - {fileID: 5550747021860642228} - m_Father: {fileID: 841030800452235700} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 70, y: 50} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Settings/Views/BoolView.prefab.meta b/Assets/Scripts/Settings/Views/BoolView.prefab.meta deleted file mode 100644 index d7bf25a..0000000 --- a/Assets/Scripts/Settings/Views/BoolView.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cdc2db675d691d3438e213fc716e5ae6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/FloatView.cs b/Assets/Scripts/Settings/Views/FloatView.cs index 0676bc2..372a517 100644 --- a/Assets/Scripts/Settings/Views/FloatView.cs +++ b/Assets/Scripts/Settings/Views/FloatView.cs @@ -1,85 +1,83 @@ -using TMPro; +using System.Collections.Generic; +using TMPro; using UnityEngine; -using UnityEngine.Events; using UnityEngine.UI; -public class FloatView : MonoBehaviour, IView +public class FloatView : MonoBehaviour, ISettingView { - [SerializeField] private Graphic Bar; - [SerializeField] private RectTransform MaskRect; + [Header("Layout ссылки")] + [SerializeField] private Image Bar; + [SerializeField] List PercentLabels; - [SerializeField] private Gradient gradient; - - [SerializeField] private float minMaskWidth = 0; - [SerializeField] private float maxMaskWidth = 150; - - [SerializeField] private float minValue = 0; - [SerializeField] private float maxValue = 1; + [Header("Звук")] + [SerializeField] private bool UseSound; + [SerializeField] private AudioClip SwitchClip; + [SerializeField] private AudioSource Source; - [SerializeField] private AudioSource source; + //Кэш значений настройки + private float minValue; + private float maxValue; + private float value; + private float delta; + private float step; - [SerializeField] TextMeshProUGUI label; + public SettingDTO CachedSetting { get; private set; } - bool useSound; - public UnityEvent OnChangeReady { get; } - - float lastSoundStart; - - public void Initialize(string settingId) + public void Initialize(SettingDTO setting) { - lastSoundStart = Time.time; - Setting setting = SettingsManager.Container.TryGetSetting(settingId); - if (setting.Type != SettingType.Float) + CachedSetting = setting; + CacheSettingValues(setting); + + Source.clip = SwitchClip; + + Display(); + } + + public void TakeInput(int direction) + { + if (direction == 0) { - Debug.LogError("Настройка не того типа (float)"); + Source.Stop(); return; } - - string value = setting.FloatValue.ToString(); - useSound = false; - ChangeValue(settingId); - useSound = true; + + value += step * Mathf.Sign(direction); + value = Mathf.Clamp(value, minValue, maxValue); + CachedSetting.FloatValue = value; + + if (UseSound) + PlaySound(value); + Display(); } - public void ChangeValue(string settingId) + private void Display() { - Setting setting = SettingsManager.Container.TryGetSetting(settingId); - if (setting.Type != SettingType.Float) + float percent = (value - minValue) / delta; + + Bar.fillAmount = percent; + + foreach (var label in PercentLabels) { - Debug.LogError("Настройка не того типа (float)"); - return; - } - float val = setting.FloatValue; - label.text = (int)(val * 100) + "%"; - - if (useSound) - { - needSound(val); - } - - - float width = minMaskWidth + (maxMaskWidth - minValue) * (maxValue-minValue) * val; - MaskRect.sizeDelta = new Vector2(width, MaskRect.sizeDelta.y); - - Bar.color = gradient.Evaluate(val); - } - - private void Update() - { - if (Time.time - lastSoundStart > 0.0001f) - { - source.Stop(); + label.text = $"{percent * 100:0}"; } } - void needSound(float val) + + private void CacheSettingValues(SettingDTO setting) { - lastSoundStart = Time.time; - source.pitch = val * 1.5f + 0.5f; - source.volume = val; - if (!source.isPlaying) - source.Play(); + minValue = setting.FloatMin; + maxValue = setting.FloatMax; + step = setting.FloatStep; + value = setting.FloatValue; + + delta = maxValue - minValue; } - + private void PlaySound(float val) + { + Source.pitch = val * 1.5f + 0.5f; + Source.volume = val; + if (!Source.isPlaying) + Source.Play(); + } } diff --git a/Assets/Scripts/Settings/Views/FloatView.prefab b/Assets/Scripts/Settings/Views/FloatView.prefab deleted file mode 100644 index 1447393..0000000 --- a/Assets/Scripts/Settings/Views/FloatView.prefab +++ /dev/null @@ -1,594 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3029227129009343262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5492637077757438234} - - component: {fileID: 5648428373508555140} - - component: {fileID: 6065878399256829986} - m_Layer: 5 - m_Name: Backgroung - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5492637077757438234 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3029227129009343262} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1863652739035713379} - m_Father: {fileID: 4636911699806808866} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5648428373508555140 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3029227129009343262} - m_CullTransparentMesh: 1 ---- !u!114 &6065878399256829986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3029227129009343262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.23018861, g: 0.23018861, b: 0.23018861, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 1304898661, guid: bff7731f029e97345b55849f0e330c32, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.7 ---- !u!1 &5882520340776089988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1863652739035713379} - - component: {fileID: 19418380385586879} - - component: {fileID: 8170013221226708388} - - component: {fileID: 5940929934980553291} - m_Layer: 5 - m_Name: BarMask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1863652739035713379 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882520340776089988} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5885173933637160126} - m_Father: {fileID: 5492637077757438234} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3, y: 0} - m_SizeDelta: {x: 144, y: -6} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &19418380385586879 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882520340776089988} - m_CullTransparentMesh: 1 ---- !u!114 &8170013221226708388 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882520340776089988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 1304898661, guid: bff7731f029e97345b55849f0e330c32, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.7 ---- !u!114 &5940929934980553291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882520340776089988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!1 &6242135183567182029 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5885173933637160126} - - component: {fileID: 2990901014560792173} - - component: {fileID: 6947658675226381134} - m_Layer: 5 - m_Name: Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5885173933637160126 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6242135183567182029} - 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: 1863652739035713379} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &2990901014560792173 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6242135183567182029} - m_CullTransparentMesh: 1 ---- !u!114 &6947658675226381134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6242135183567182029} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 1304898661, guid: bff7731f029e97345b55849f0e330c32, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.7 ---- !u!1 &7071847115429231819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8426025539405696080} - - component: {fileID: 844827181800515968} - m_Layer: 0 - m_Name: "\u0421\u0438\u043D\u0443\u0441\u041B\u044F" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8426025539405696080 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071847115429231819} - serializedVersion: 2 - 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: 4636911699806808866} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &844827181800515968 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071847115429231819} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 548caa46227f86a4f929dd8e94008645, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &7872553190807181184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4636911699806808866} - - component: {fileID: 5411050555364091194} - m_Layer: 5 - m_Name: FloatView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4636911699806808866 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7872553190807181184} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5492637077757438234} - - {fileID: 8426025539405696080} - - {fileID: 2170707450924121494} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 550, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &5411050555364091194 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7872553190807181184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a8d664be26d7260418a0637442d1694d, type: 3} - m_Name: - m_EditorClassIdentifier: - Bar: {fileID: 6947658675226381134} - MaskRect: {fileID: 1863652739035713379} - gradient: - serializedVersion: 2 - key0: {r: 0.2528302, g: 0.11897893, b: 0, a: 0.5411765} - key1: {r: 1, g: 0.46685582, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - minMaskWidth: 0 - maxMaskWidth: 144 - minValue: 0 - maxValue: 1 - source: {fileID: 844827181800515968} - label: {fileID: 2860546697854218749} ---- !u!1 &8275824559585719445 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2170707450924121494} - - component: {fileID: 4959304757546779317} - - component: {fileID: 2860546697854218749} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2170707450924121494 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8275824559585719445} - 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: 4636911699806808866} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 62.41, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4959304757546779317 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8275824559585719445} - m_CullTransparentMesh: 1 ---- !u!114 &2860546697854218749 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8275824559585719445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 100% - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/Views/FloatView.prefab.meta b/Assets/Scripts/Settings/Views/FloatView.prefab.meta deleted file mode 100644 index de10e8d..0000000 --- a/Assets/Scripts/Settings/Views/FloatView.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f2cc4d65460a1864cac8d119b87a76a2 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ISettingView.cs b/Assets/Scripts/Settings/Views/ISettingView.cs new file mode 100644 index 0000000..f2b21b7 --- /dev/null +++ b/Assets/Scripts/Settings/Views/ISettingView.cs @@ -0,0 +1,5 @@ +public interface ISettingView +{ + void Initialize(SettingDTO setting); + void TakeInput(int direction); +} diff --git a/Assets/Scripts/Settings/Views/ISettingView.cs.meta b/Assets/Scripts/Settings/Views/ISettingView.cs.meta new file mode 100644 index 0000000..935f5e7 --- /dev/null +++ b/Assets/Scripts/Settings/Views/ISettingView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9c1b2abd65032ca4a8dc779107e254a2 \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/IView.cs b/Assets/Scripts/Settings/Views/IView.cs deleted file mode 100644 index b4e7cd6..0000000 --- a/Assets/Scripts/Settings/Views/IView.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Events; - -public interface IView -{ - void Initialize(string settingId); - void ChangeValue(string settingId); - UnityEvent OnChangeReady { get; } -} diff --git a/Assets/Scripts/Settings/Views/IView.cs.meta b/Assets/Scripts/Settings/Views/IView.cs.meta deleted file mode 100644 index 2e7276e..0000000 --- a/Assets/Scripts/Settings/Views/IView.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3f10c7ea7d167a84691adcd17ad599bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/IViewStringSupplier.cs b/Assets/Scripts/Settings/Views/IViewStringSupplier.cs deleted file mode 100644 index 2e617b9..0000000 --- a/Assets/Scripts/Settings/Views/IViewStringSupplier.cs +++ /dev/null @@ -1,4 +0,0 @@ -public interface IViewStringSupplier -{ - string GetStringForView(); -} diff --git a/Assets/Scripts/Settings/Views/IViewStringSupplier.cs.meta b/Assets/Scripts/Settings/Views/IViewStringSupplier.cs.meta deleted file mode 100644 index df783af..0000000 --- a/Assets/Scripts/Settings/Views/IViewStringSupplier.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e69fa4a2b77157f45bc595f7e17c340d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/IntView.cs b/Assets/Scripts/Settings/Views/IntView.cs new file mode 100644 index 0000000..774129d --- /dev/null +++ b/Assets/Scripts/Settings/Views/IntView.cs @@ -0,0 +1,181 @@ +using System.Collections; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class IntView : MonoBehaviour, ISettingView +{ + [Header("Layout ссылки")] + [SerializeField] private TextMeshProUGUI ValueLabel; + [SerializeField] private Image LeftArrow; + [SerializeField] private Image RightArrow; + + [SerializeField] private Color NormalColor; + [SerializeField] private Color InactiveColor; + + + [Header("Ускоренное переключение")] + [SerializeField] private float initialDelay = 0.5f; // Задержка перед началом ускорения + [SerializeField] private float minRepeatDelay = 0.05f; // Минимальная задержка между изменениями + [SerializeField] private float accelerationSpeed = 0.95f; // Скорость ускорения (чем меньше, тем быстрее) + + [Header("Звук")] + [SerializeField] private bool UseSound = true; + [SerializeField] private AudioClip SwitchClip; + [SerializeField] private AudioSource Source; + + // Кэш значений настройки + private int minValue; + private int maxValue; + private int currentValue; + private int step = 1; + + // Состояние ускоренного переключения + private Coroutine accelerationCoroutine; + private int currentDirection = 0; // -1 = влево, 0 = нет, 1 = вправо + + public SettingDTO CachedSetting { get; private set; } + + public void Initialize(SettingDTO setting) + { + CachedSetting = setting; + CacheSettingValues(setting); + + if (Source != null && SwitchClip != null) + Source.clip = SwitchClip; + + UpdateUI(); + } + + public void TakeInput(int direction) + { + if (direction != 0) + { + if (currentDirection == direction) + return; + + currentDirection = direction; + ChangeValue(currentDirection); + + if (accelerationCoroutine != null) + StopCoroutine(accelerationCoroutine); + accelerationCoroutine = StartCoroutine(AcceleratedSwitching()); + } + else + { + + if (accelerationCoroutine != null) + { + StopCoroutine(accelerationCoroutine); + accelerationCoroutine = null; + } + currentDirection = 0; + + if (UseSound && Source != null && Source.isPlaying) + Source.Stop(); + } + } + + private IEnumerator AcceleratedSwitching() + { + float delay = initialDelay; + yield return new WaitForSeconds(delay); + + // Ускоренное переключение + while (currentDirection != 0) + { + ChangeValue(currentDirection); + delay = Mathf.Max(minRepeatDelay, delay * accelerationSpeed); + + yield return new WaitForSeconds(delay); + } + } + + private void ChangeValue(int direction) + { + if (direction == 0) return; + + int newValue = currentValue + step * (int)Mathf.Sign(direction); + + newValue = Mathf.Clamp(newValue, minValue, maxValue); + if (newValue == currentValue) + { + return; + } + + currentValue = newValue; + CachedSetting.IntValue = currentValue; + + + if (UseSound) + PlaySound(); + + UpdateUI(); + } + + private void UpdateUI() + { + if (ValueLabel != null) + { + //ValueLabel.text = $"{currentValue}"; + ValueLabel.text = $"{currentValue}"; + + } + UpdateArrows(); + } + + private void UpdateArrows() + { + LeftArrow.color = currentValue > minValue ? NormalColor : InactiveColor; + RightArrow.color = currentValue < maxValue ? NormalColor : InactiveColor; + } + + private void PlaySound() + { + if (!UseSound || Source == null) return; + + // Динамический питч в зависимости от скорости переключения + if (accelerationCoroutine != null) + { + // При ускоренном переключении повышаем питч + float pitchMultiplier = Mathf.Lerp(1f, 2f, + (initialDelay - Mathf.Max(minRepeatDelay, + initialDelay * Mathf.Pow(accelerationSpeed, 10))) / initialDelay); + Source.pitch = Mathf.Clamp(0.8f + pitchMultiplier * 0.5f, 0.8f, 1.5f); + } + else + { + Source.pitch = 1f; + } + + Source.PlayOneShot(SwitchClip); + } + + private void CacheSettingValues(SettingDTO setting) + { + minValue = setting.IntMin; + maxValue = setting.IntMax; + currentValue = setting.IntValue; + step = setting.IntStep; + + if (step <= 0) + { + Debug.LogWarning($"Step is zero or negative ({step}), setting to 1", this); + step = 1; + } + + if (minValue >= maxValue) + { + Debug.LogWarning($"Invalid range: min={minValue}, max={maxValue}", this); + } + } + + private void OnDestroy() + { + if (accelerationCoroutine != null) + StopCoroutine(accelerationCoroutine); + + if (Source != null && Source.isPlaying) + Source.Stop(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/IntView.cs.meta b/Assets/Scripts/Settings/Views/IntView.cs.meta new file mode 100644 index 0000000..ece1da3 --- /dev/null +++ b/Assets/Scripts/Settings/Views/IntView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 98e213c3e8dc53c4fa3852d32b28590e \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/SettingGroupView.cs b/Assets/Scripts/Settings/Views/SettingGroupView.cs new file mode 100644 index 0000000..54f36eb --- /dev/null +++ b/Assets/Scripts/Settings/Views/SettingGroupView.cs @@ -0,0 +1,85 @@ +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +//Для экрана +public class SettingGroupView : MonoBehaviour +{ + [Header("Layout ссылки")] + [SerializeField] private TextMeshProUGUI TitleLabel; + [SerializeField] private Image IconImage; + [SerializeField] private RectTransform SettingsContainer; + + [Header("Параметры Layout'а")] + [SerializeField] private float HeaderHeight = 120; + [SerializeField] private float SettingHeight = 50; + [SerializeField] private float Spacing = 20; + [SerializeField] private float FooterHeight = 20; + + + [Header("Перфабы")] + [SerializeField] private SettingView SettingViewPrefab; + + public List GeneratedSettingViews { get; private set; } + + public void Generate(SettingsGroupDTO group) + { + this.name = "(group) " + group.Name; + TitleLabel.text = group.Name; + IconImage.sprite = LoadIcon(group.IconPath); + + GeneratedSettingViews = new(); + foreach (var setting in group.Settings) + { + var go = Instantiate(SettingViewPrefab.gameObject, SettingsContainer); + var settingView = go.GetComponent(); + settingView.Generate(setting); + + GeneratedSettingViews.Add(settingView); + } + + SetSizesAndPositions(group); + } + + private void SetSizesAndPositions(SettingsGroupDTO group) + { + var thisRect = GetComponent(); + + //IconImage.rectTransform.sizeDelta = new Vector2(TitleHeight, TitleHeight); + + //Настройка заголовка + var titleWidth = thisRect.sizeDelta.x - HeaderHeight - Spacing * 2; + //TitleLabel.rectTransform.sizeDelta = new Vector2(titleWidth, TitleHeight); + //TitleLabel.rectTransform.anchoredPosition = new Vector2(2 * Spacing + TitleHeight, -Spacing); + + //Настройка контейнера настроек + //float settingsContainerHeight = group.Settings.Count * (SettingHeight + Spacing) - Spacing; + float settingsContainerHeight = GeneratedSettingViews.Count * (SettingHeight + Spacing) - Spacing; + + + SettingsContainer.sizeDelta = new Vector2(SettingsContainer.sizeDelta.x, settingsContainerHeight); + SettingsContainer.anchoredPosition = new Vector2(x: SettingsContainer.anchoredPosition.x, + y: -HeaderHeight - Spacing); + + //Настройка родиткльского контейнера + thisRect.sizeDelta = new Vector2(thisRect.sizeDelta.x, HeaderHeight + SettingsContainer.sizeDelta.y + FooterHeight); + } + + private Sprite LoadIcon(string iconPath) + { + if (string.IsNullOrEmpty(iconPath)) + return null; + + // Пытаемся загрузить из Resources + Sprite loadedSprite = Resources.Load(iconPath); + + if (loadedSprite == null) + { + Debug.LogWarning($"Не удалось загрузить иконку по пути: {iconPath}"); + } + + return loadedSprite; + } + +} diff --git a/Assets/Scripts/Settings/Views/SettingGroupView.cs.meta b/Assets/Scripts/Settings/Views/SettingGroupView.cs.meta new file mode 100644 index 0000000..fa9bee4 --- /dev/null +++ b/Assets/Scripts/Settings/Views/SettingGroupView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a49bee9af8acb3e4a9d79f803f06e51f \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/SettingView.cs b/Assets/Scripts/Settings/Views/SettingView.cs new file mode 100644 index 0000000..8b5cd13 --- /dev/null +++ b/Assets/Scripts/Settings/Views/SettingView.cs @@ -0,0 +1,49 @@ +using TMPro; +using UnityEngine; + +public class SettingView : MonoBehaviour +{ + [Header("Layout ссылки")] + [SerializeField] private TextMeshProUGUI SettingNameLabel; + + [Header("Префабы")] + [SerializeField] private BoolView boolView; + [SerializeField] private IntView intView; + [SerializeField] private FloatView floatView; + [SerializeField] private StringView stringView; + [SerializeField] private SignalView signalView; + + ISettingView view; + + + public void InteractView(int direction) + { + if (view == null) return; + view.TakeInput(direction); + } + public void Generate(SettingDTO setting) + { + this.name = "(setting) " + setting.Alias; + SettingNameLabel.text = setting.Alias; + + var view = Instantiate(ViewByType(setting.Type), transform).GetComponent(); + view.Initialize(setting); + this.view = view; + } + + private GameObject ViewByType(Setting.SettingType type) + { + return type switch + { + Setting.SettingType.Bool => boolView.gameObject, + Setting.SettingType.Float => floatView.gameObject, + Setting.SettingType.Signal => signalView.gameObject, + Setting.SettingType.String => stringView.gameObject, + Setting.SettingType.Int => intView.gameObject, + _ => boolView.gameObject + }; + } + + + +} diff --git a/Assets/Scripts/Settings/Views/SettingView.cs.meta b/Assets/Scripts/Settings/Views/SettingView.cs.meta new file mode 100644 index 0000000..307245d --- /dev/null +++ b/Assets/Scripts/Settings/Views/SettingView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fb6eb0f99778bfd4c8abc0e6eff6375d \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/SignalView.cs b/Assets/Scripts/Settings/Views/SignalView.cs new file mode 100644 index 0000000..fdf4065 --- /dev/null +++ b/Assets/Scripts/Settings/Views/SignalView.cs @@ -0,0 +1,56 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +public class SignalView : MonoBehaviour, ISettingView +{ + public static event Action SignalEmmited; + + [Header("Layout ссылки")] + [SerializeField] private Image ButtonImage; + + [Header("Настройки анимации")] + [SerializeField] private Color ButtonColorPressed; + [SerializeField] private Color ButtonColorNormal; + + + [Header("Звуки")] + [SerializeField] private AudioClip AcceptedClip; + + private string signal; + private bool pressed; + private bool acted = false; + + public void Initialize(SettingDTO setting) + { + signal = setting.SignalValue; + } + + public void TakeInput(int direction) + { + pressed = direction != 0; + } + + private void LateUpdate() + { + Display(); + + if (pressed && !acted) + EmmitSignal(); + + if(!pressed && acted) + acted = false; + } + + private void Display() + { + ButtonImage.color = pressed ? ButtonColorPressed : ButtonColorNormal; + } + + private void EmmitSignal() + { + acted = true; + SoundManager.instance.playClip(AcceptedClip); + SignalEmmited?.Invoke(signal); + } +} diff --git a/Assets/Scripts/Settings/Views/SignalView.cs.meta b/Assets/Scripts/Settings/Views/SignalView.cs.meta new file mode 100644 index 0000000..d26c10e --- /dev/null +++ b/Assets/Scripts/Settings/Views/SignalView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0ac5ce41d41becf4db103a3b68f7ccf0 \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/StringView.cs b/Assets/Scripts/Settings/Views/StringView.cs index 0f7bdbc..4b74b75 100644 --- a/Assets/Scripts/Settings/Views/StringView.cs +++ b/Assets/Scripts/Settings/Views/StringView.cs @@ -1,121 +1,69 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using TMPro; +using TMPro; using UnityEngine; -using UnityEngine.Events; +using UnityEngine.UI; -public class StringView : MonoBehaviour, IView +public class StringView : MonoBehaviour, ISettingView { - [SerializeField] private GameObject TextSlotPrefab; - [SerializeField] private RectTransform Content; - public AudioClip clip; + [Header("Настройки Layout'а")] + [SerializeField] private TextMeshProUGUI ValueLabel; + [SerializeField] private Image LeftPointer; + [SerializeField] private Image RightPointer; - [SerializeField] float blockWidth = 150f; - private Setting setting; - Vector2 targetPosition; - Vector2 velocity = Vector2.zero; - public UnityEvent OnChangeReady { get; } - Coroutine coroutine; - bool generated = false; + [SerializeField] private Color NormalColor; + [SerializeField] private Color InactiveColor; - public GameObject left, right; + [Header("Звуки")] + [SerializeField] private AudioClip SwitchClip; + public SettingDTO CachedSetting { get; private set; } + private int MaxIndex => CachedSetting.AllowedValues.Count - 1; + private int currentIndex = 0; + private bool pressed = false; - private void OnEnable() + public void Initialize(SettingDTO setting) { - if (coroutine == null) - { - coroutine = StartCoroutine(Display()); - } - } - private void OnDisable() - { - StopAllCoroutines(); - coroutine = null; + CachedSetting = setting; + currentIndex = CalculateCurrentIndex(); + UpdateUi(); } - - - //Тут придется id настройки давать. А почему бы не везде так давать. - public void Initialize(string settingId) + public void TakeInput(int direction) { - setting = SettingsManager.Container.TryGetSetting(settingId); - if (setting.Type != SettingType.String) + if (direction == 0) { - Debug.LogError("Настройка не того типа (string)"); + pressed = false; return; } - GenerateLine(); - StartCoroutine(Display()); + if (pressed) return; + + pressed = true; + int newIndex = Mathf.Clamp(currentIndex + direction, 0, MaxIndex); + if (newIndex == currentIndex) return; + + + currentIndex = newIndex; + + CachedSetting.StringValue = CachedSetting.AllowedValues[currentIndex]; + SoundManager.instance.playClip(SwitchClip); + UpdateUi(); } - public void ChangeValue(string newValue) + + private int CalculateCurrentIndex() { - int index = setting.AllowedValues.IndexOf(setting.StringValue); - Vector2 newtargetPosition = new Vector2(-index * blockWidth, 0); - if(newtargetPosition != targetPosition) - { - targetPosition = newtargetPosition; - SoundManager.instance.playClip(clip); - } - - - SetupPointers(index); + int index = CachedSetting.AllowedValues.IndexOf(CachedSetting.StringValue); + return index < 0 ? 0 : index; } - private void SetupPointers(int index) + private void UpdatePointers() { - if (index == 0) - { - left.SetActive(false); - right.SetActive(true); - } - else if (index == setting.AllowedValues.Count - 1) - { - left.SetActive(true); - right.SetActive(false); - } - else - { - left.SetActive(true); - right.SetActive(true); - } - + LeftPointer.color = currentIndex > 0 ? NormalColor : InactiveColor; + RightPointer.color = currentIndex < MaxIndex ? NormalColor : InactiveColor; } - private void GenerateLine() + private void UpdateUi() { - float XPosition = 0; - foreach (string text in setting.AllowedValues) - { - RectTransform rect = Instantiate(TextSlotPrefab, Content).GetComponent(); - rect.anchoredPosition = new Vector2(XPosition, 0); - XPosition += blockWidth; - - - TextMeshProUGUI label = rect.GetComponent(); - label.text = text; - } - - //переместиться на текущее значение - int index = setting.AllowedValues.IndexOf(setting.StringValue); - targetPosition = new Vector2(-index * blockWidth, 0); - SetupPointers(index); - generated = true; + ValueLabel.text = CachedSetting.StringValue; + UpdatePointers(); } - - IEnumerator Display() - { - if (!generated) yield break; - while (true) - { - Content.anchoredPosition = Vector2.SmoothDamp(current: Content.anchoredPosition, - target: targetPosition, - currentVelocity: ref velocity, - smoothTime: 0.1f); - yield return null; - } - } - -} +} \ No newline at end of file diff --git a/Assets/Scripts/Settings/Views/StringView.prefab b/Assets/Scripts/Settings/Views/StringView.prefab deleted file mode 100644 index 87725af..0000000 --- a/Assets/Scripts/Settings/Views/StringView.prefab +++ /dev/null @@ -1,364 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1058987381655427136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8250456940932692993} - - component: {fileID: 7090747987213669101} - - component: {fileID: 6289517111072208481} - - component: {fileID: 9162461033094178883} - m_Layer: 5 - m_Name: Background/mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8250456940932692993 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058987381655427136} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6124592016770008866} - m_Father: {fileID: 2120496256587323981} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7090747987213669101 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058987381655427136} - m_CullTransparentMesh: 1 ---- !u!114 &6289517111072208481 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058987381655427136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9162461033094178883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058987381655427136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!1 &2183866019990978811 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1983068391488706520} - - component: {fileID: 1471564968783022820} - - component: {fileID: 7871706780981211764} - - component: {fileID: 7569845052093222805} - m_Layer: 5 - m_Name: left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1983068391488706520 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2183866019990978811} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2120496256587323981} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.25, y: 0.5} ---- !u!222 &1471564968783022820 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2183866019990978811} - m_CullTransparentMesh: 1 ---- !u!114 &7871706780981211764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2183866019990978811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa46adafa643d084abe86ac0f3697446, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7569845052093222805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2183866019990978811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} - m_Name: - m_EditorClassIdentifier: - amplitude: 0.5 - speed: 7 ---- !u!1 &2411643208637742630 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2120496256587323981} - - component: {fileID: 8102936980919194432} - m_Layer: 5 - m_Name: StringView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2120496256587323981 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2411643208637742630} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8250456940932692993} - - {fileID: 7624587537395918063} - - {fileID: 1983068391488706520} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 550, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &8102936980919194432 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2411643208637742630} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92b7e97bf63d9224484d902c7acae3d4, type: 3} - m_Name: - m_EditorClassIdentifier: - TextSlotPrefab: {fileID: 7728396724190647939, guid: f5d54ecee0f9d624f90414031fc89d90, type: 3} - Content: {fileID: 6124592016770008866} - clip: {fileID: 8300000, guid: 70982532191dd7346bf6999b59e666e3, type: 3} - blockWidth: 150 - left: {fileID: 2183866019990978811} - right: {fileID: 6806067520339651116} ---- !u!1 &6806067520339651116 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7624587537395918063} - - component: {fileID: 1387695649585248217} - - component: {fileID: 6914291324119274910} - - component: {fileID: 1548906605084535224} - m_Layer: 5 - m_Name: right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7624587537395918063 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6806067520339651116} - 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: 2120496256587323981} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.25, y: 0.5} ---- !u!222 &1387695649585248217 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6806067520339651116} - m_CullTransparentMesh: 1 ---- !u!114 &6914291324119274910 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6806067520339651116} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa46adafa643d084abe86ac0f3697446, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1548906605084535224 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6806067520339651116} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} - m_Name: - m_EditorClassIdentifier: - amplitude: 0.5 - speed: 7 ---- !u!1 &6942382290731078094 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6124592016770008866} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6124592016770008866 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6942382290731078094} - 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: 8250456940932692993} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} diff --git a/Assets/Scripts/Settings/Views/StringView.prefab.meta b/Assets/Scripts/Settings/Views/StringView.prefab.meta deleted file mode 100644 index 4611282..0000000 --- a/Assets/Scripts/Settings/Views/StringView.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ffadea15cbb760944a0da2c4cc5997d9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/TextSlot.prefab b/Assets/Scripts/Settings/Views/TextSlot.prefab deleted file mode 100644 index a7953b0..0000000 --- a/Assets/Scripts/Settings/Views/TextSlot.prefab +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7728396724190647939 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2322915585139284286} - - component: {fileID: 7748441561928362171} - - component: {fileID: 4123222658002905107} - m_Layer: 5 - m_Name: TextSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2322915585139284286 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728396724190647939} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7748441561928362171 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728396724190647939} - m_CullTransparentMesh: 1 ---- !u!114 &4123222658002905107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728396724190647939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u0421\u043B\u043E\u0442 \u0442\u0435\u043A\u0441\u0442\u0430" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 16 - m_fontSizeMax: 22 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Settings/Views/TextSlot.prefab.meta b/Assets/Scripts/Settings/Views/TextSlot.prefab.meta deleted file mode 100644 index 8c19a38..0000000 --- a/Assets/Scripts/Settings/Views/TextSlot.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f5d54ecee0f9d624f90414031fc89d90 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ToggleOff.wav b/Assets/Scripts/Settings/Views/ToggleOff.wav deleted file mode 100644 index 7afa9da..0000000 Binary files a/Assets/Scripts/Settings/Views/ToggleOff.wav and /dev/null differ diff --git a/Assets/Scripts/Settings/Views/ToggleOff.wav.meta b/Assets/Scripts/Settings/Views/ToggleOff.wav.meta deleted file mode 100644 index 17b01e2..0000000 --- a/Assets/Scripts/Settings/Views/ToggleOff.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: af069d6da1cc68847b46eaab855901ca -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ToggleOn.mp3 b/Assets/Scripts/Settings/Views/ToggleOn.mp3 deleted file mode 100644 index b342704..0000000 Binary files a/Assets/Scripts/Settings/Views/ToggleOn.mp3 and /dev/null differ diff --git a/Assets/Scripts/Settings/Views/ToggleOn.mp3.meta b/Assets/Scripts/Settings/Views/ToggleOn.mp3.meta deleted file mode 100644 index fac452a..0000000 --- a/Assets/Scripts/Settings/Views/ToggleOn.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 70982532191dd7346bf6999b59e666e3 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs b/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs deleted file mode 100644 index a91f114..0000000 --- a/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -//НАДО НА СВЕЖУЮ ГОЛОВУ ЭТО ПОСМОТРЕТЬ ЭОТ ОТ ДИПСИКА -public class ViewPrefabsProvider : MonoBehaviour -{ - [SerializeField] private List mappings = new List(); - private Dictionary prefabDictionary; - - public void Initialize() - { - prefabDictionary = new Dictionary(); - foreach (var mapping in mappings) - { - if (mapping.prefab != null) prefabDictionary[mapping.id] = mapping.prefab; - } - } - - public GameObject GetViewPrefab(string id) - { - if (prefabDictionary.TryGetValue(id, out GameObject prefab)) - { - return prefab; - } - - Debug.LogError($"Prefab with ID {id} not found!"); - return null; - } - - [System.Serializable] - public class PrefabMapping - { - public string id; - public GameObject prefab; - } -} diff --git a/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs.meta b/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs.meta deleted file mode 100644 index a1629eb..0000000 --- a/Assets/Scripts/Settings/Views/ViewPrefabsProvider.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8c4ccac32cdcedf41911646355347845 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/Views/без названия.wav b/Assets/Scripts/Settings/Views/без названия.wav deleted file mode 100644 index 728a6b1..0000000 Binary files a/Assets/Scripts/Settings/Views/без названия.wav and /dev/null differ diff --git a/Assets/Scripts/Settings/Views/без названия.wav.meta b/Assets/Scripts/Settings/Views/без названия.wav.meta deleted file mode 100644 index db68ecc..0000000 --- a/Assets/Scripts/Settings/Views/без названия.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 548caa46227f86a4f929dd8e94008645 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Circle 1.png b/Assets/Sprites/Circle 1.png similarity index 100% rename from Assets/Circle 1.png rename to Assets/Sprites/Circle 1.png diff --git a/Assets/Circle 1.png.meta b/Assets/Sprites/Circle 1.png.meta similarity index 100% rename from Assets/Circle 1.png.meta rename to Assets/Sprites/Circle 1.png.meta diff --git a/Assets/arrow.png b/Assets/Sprites/arrow.png similarity index 100% rename from Assets/arrow.png rename to Assets/Sprites/arrow.png diff --git a/Assets/arrow.png.meta b/Assets/Sprites/arrow.png.meta similarity index 100% rename from Assets/arrow.png.meta rename to Assets/Sprites/arrow.png.meta diff --git a/Assets/boardMask 1.png b/Assets/Sprites/boardMask 1.png similarity index 100% rename from Assets/boardMask 1.png rename to Assets/Sprites/boardMask 1.png diff --git a/Assets/boardMask 1.png.meta b/Assets/Sprites/boardMask 1.png.meta similarity index 100% rename from Assets/boardMask 1.png.meta rename to Assets/Sprites/boardMask 1.png.meta diff --git a/Assets/buttons.png b/Assets/Sprites/buttons.png similarity index 100% rename from Assets/buttons.png rename to Assets/Sprites/buttons.png diff --git a/Assets/buttons.png.meta b/Assets/Sprites/buttons.png.meta similarity index 100% rename from Assets/buttons.png.meta rename to Assets/Sprites/buttons.png.meta diff --git a/Assets/circle mini.png b/Assets/Sprites/circle mini.png similarity index 100% rename from Assets/circle mini.png rename to Assets/Sprites/circle mini.png diff --git a/Assets/circle mini.png.meta b/Assets/Sprites/circle mini.png.meta similarity index 100% rename from Assets/circle mini.png.meta rename to Assets/Sprites/circle mini.png.meta diff --git a/Assets/circle.png b/Assets/Sprites/circle.png similarity index 100% rename from Assets/circle.png rename to Assets/Sprites/circle.png diff --git a/Assets/circle.png.meta b/Assets/Sprites/circle.png.meta similarity index 100% rename from Assets/circle.png.meta rename to Assets/Sprites/circle.png.meta diff --git a/Assets/coin.png b/Assets/Sprites/coin.png similarity index 100% rename from Assets/coin.png rename to Assets/Sprites/coin.png diff --git a/Assets/coin.png.meta b/Assets/Sprites/coin.png.meta similarity index 100% rename from Assets/coin.png.meta rename to Assets/Sprites/coin.png.meta diff --git a/Assets/comic dots.png b/Assets/Sprites/comic dots.png similarity index 100% rename from Assets/comic dots.png rename to Assets/Sprites/comic dots.png diff --git a/Assets/comic dots.png.meta b/Assets/Sprites/comic dots.png.meta similarity index 100% rename from Assets/comic dots.png.meta rename to Assets/Sprites/comic dots.png.meta diff --git a/Assets/level.png b/Assets/Sprites/level.png similarity index 100% rename from Assets/level.png rename to Assets/Sprites/level.png diff --git a/Assets/level.png.meta b/Assets/Sprites/level.png.meta similarity index 100% rename from Assets/level.png.meta rename to Assets/Sprites/level.png.meta diff --git a/Assets/level2.png b/Assets/Sprites/level2.png similarity index 100% rename from Assets/level2.png rename to Assets/Sprites/level2.png diff --git a/Assets/level2.png.meta b/Assets/Sprites/level2.png.meta similarity index 100% rename from Assets/level2.png.meta rename to Assets/Sprites/level2.png.meta diff --git a/Assets/line.png b/Assets/Sprites/line.png similarity index 100% rename from Assets/line.png rename to Assets/Sprites/line.png diff --git a/Assets/line.png.meta b/Assets/Sprites/line.png.meta similarity index 100% rename from Assets/line.png.meta rename to Assets/Sprites/line.png.meta diff --git a/Assets/mask.png b/Assets/Sprites/mask.png similarity index 100% rename from Assets/mask.png rename to Assets/Sprites/mask.png diff --git a/Assets/mask.png.meta b/Assets/Sprites/mask.png.meta similarity index 100% rename from Assets/mask.png.meta rename to Assets/Sprites/mask.png.meta diff --git a/Assets/modes.png b/Assets/Sprites/modes.png similarity index 100% rename from Assets/modes.png rename to Assets/Sprites/modes.png diff --git a/Assets/modes.png.meta b/Assets/Sprites/modes.png.meta similarity index 100% rename from Assets/modes.png.meta rename to Assets/Sprites/modes.png.meta diff --git a/Assets/prize_icons.png b/Assets/Sprites/prize_icons.png similarity index 100% rename from Assets/prize_icons.png rename to Assets/Sprites/prize_icons.png diff --git a/Assets/prize_icons.png.meta b/Assets/Sprites/prize_icons.png.meta similarity index 100% rename from Assets/prize_icons.png.meta rename to Assets/Sprites/prize_icons.png.meta diff --git a/Assets/rating_panel.png b/Assets/Sprites/rating_panel.png similarity index 100% rename from Assets/rating_panel.png rename to Assets/Sprites/rating_panel.png diff --git a/Assets/rating_panel.png.meta b/Assets/Sprites/rating_panel.png.meta similarity index 100% rename from Assets/rating_panel.png.meta rename to Assets/Sprites/rating_panel.png.meta diff --git a/Assets/rules_1.png b/Assets/Sprites/rules_1.png similarity index 100% rename from Assets/rules_1.png rename to Assets/Sprites/rules_1.png diff --git a/Assets/rules_1.png.meta b/Assets/Sprites/rules_1.png.meta similarity index 100% rename from Assets/rules_1.png.meta rename to Assets/Sprites/rules_1.png.meta diff --git a/Assets/rules_2.png b/Assets/Sprites/rules_2.png similarity index 100% rename from Assets/rules_2.png rename to Assets/Sprites/rules_2.png diff --git a/Assets/rules_2.png.meta b/Assets/Sprites/rules_2.png.meta similarity index 100% rename from Assets/rules_2.png.meta rename to Assets/Sprites/rules_2.png.meta diff --git a/Assets/rules_3.png b/Assets/Sprites/rules_3.png similarity index 100% rename from Assets/rules_3.png rename to Assets/Sprites/rules_3.png diff --git a/Assets/rules_3.png.meta b/Assets/Sprites/rules_3.png.meta similarity index 100% rename from Assets/rules_3.png.meta rename to Assets/Sprites/rules_3.png.meta diff --git a/Assets/rules_4.png b/Assets/Sprites/rules_4.png similarity index 100% rename from Assets/rules_4.png rename to Assets/Sprites/rules_4.png diff --git a/Assets/rules_4.png.meta b/Assets/Sprites/rules_4.png.meta similarity index 100% rename from Assets/rules_4.png.meta rename to Assets/Sprites/rules_4.png.meta diff --git a/Assets/settings_asset.png b/Assets/Sprites/settings_asset.png similarity index 100% rename from Assets/settings_asset.png rename to Assets/Sprites/settings_asset.png diff --git a/Assets/settings_asset.png.meta b/Assets/Sprites/settings_asset.png.meta similarity index 100% rename from Assets/settings_asset.png.meta rename to Assets/Sprites/settings_asset.png.meta diff --git a/Assets/square.png b/Assets/Sprites/square.png similarity index 100% rename from Assets/square.png rename to Assets/Sprites/square.png diff --git a/Assets/square.png.meta b/Assets/Sprites/square.png.meta similarity index 100% rename from Assets/square.png.meta rename to Assets/Sprites/square.png.meta diff --git a/Assets/table_emit.png b/Assets/Sprites/table_emit.png similarity index 100% rename from Assets/table_emit.png rename to Assets/Sprites/table_emit.png diff --git a/Assets/table_emit.png.meta b/Assets/Sprites/table_emit.png.meta similarity index 100% rename from Assets/table_emit.png.meta rename to Assets/Sprites/table_emit.png.meta diff --git a/Assets/title.png b/Assets/Sprites/title.png similarity index 100% rename from Assets/title.png rename to Assets/Sprites/title.png diff --git a/Assets/title.png.meta b/Assets/Sprites/title.png.meta similarity index 100% rename from Assets/title.png.meta rename to Assets/Sprites/title.png.meta diff --git a/Assets/Монтажная область 13.png b/Assets/Sprites/Монтажная область 13.png similarity index 100% rename from Assets/Монтажная область 13.png rename to Assets/Sprites/Монтажная область 13.png diff --git a/Assets/Монтажная область 13.png.meta b/Assets/Sprites/Монтажная область 13.png.meta similarity index 100% rename from Assets/Монтажная область 13.png.meta rename to Assets/Sprites/Монтажная область 13.png.meta diff --git a/Assets/Монтажная область 14.png b/Assets/Sprites/Монтажная область 14.png similarity index 100% rename from Assets/Монтажная область 14.png rename to Assets/Sprites/Монтажная область 14.png diff --git a/Assets/Монтажная область 14.png.meta b/Assets/Sprites/Монтажная область 14.png.meta similarity index 100% rename from Assets/Монтажная область 14.png.meta rename to Assets/Sprites/Монтажная область 14.png.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 7d11936..72e13b6 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -112,9 +112,9 @@ Material: - _Parallax: 0.02 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.90909094 + - _ScaleRatioA: 0.9 - _ScaleRatioB: 0.73125 - - _ScaleRatioC: 0.7386364 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -237,6 +237,456 @@ MonoBehaviour: m_MultipleSubstitutionRecords: [] m_LigatureSubstitutionRecords: [] m_GlyphPairAdjustmentRecords: + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 60 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 827 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 836 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 839 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 846 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 854 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 855 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 861 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 3 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 15 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 16 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 17 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 29 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 30 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -6.3828125 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 36 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.5537109 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 50 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 68 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 70 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 72 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -3.1914062 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 76 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 82 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -3.1914062 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 85 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -9.532227 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 86 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -3.1914062 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 88 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 90 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 55 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 92 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 90 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 15 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 90 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -4.745117 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 17 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 - m_FirstAdjustmentRecord: m_GlyphIndex: 979 m_GlyphValueRecord: @@ -702,6 +1152,66 @@ MonoBehaviour: m_XAdvance: 0 m_YAdvance: 0 m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1000 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1016 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 - m_FirstAdjustmentRecord: m_GlyphIndex: 998 m_GlyphValueRecord: @@ -837,6 +1347,276 @@ MonoBehaviour: m_XAdvance: 0 m_YAdvance: 0 m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 994 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1000 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1004 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1007 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1010 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1022 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.9736328 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 997 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1000 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -2.9394531 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1004 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1014 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1016 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1009 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1024 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 - m_FirstAdjustmentRecord: m_GlyphIndex: 1010 m_GlyphValueRecord: @@ -1167,336 +1947,6 @@ MonoBehaviour: m_XAdvance: 0 m_YAdvance: 0 m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 993 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 994 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 998 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1000 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1004 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1007 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1010 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1011 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1012 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1003 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1022 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.9736328 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 997 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1000 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -2.9394531 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1004 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1011 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1012 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1014 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1016 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 1009 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1024 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 993 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1000 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 993 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1011 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 993 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -0.9658203 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1012 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 - - m_FirstAdjustmentRecord: - m_GlyphIndex: 993 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -1.8896484 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 1016 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 m_MarkToBaseAdjustmentRecords: [] m_MarkToMarkAdjustmentRecords: [] m_ShouldReimportFontFeatures: 0 diff --git a/Assets/levitate.anim b/Assets/levitate.anim deleted file mode 100644 index 85d6f5e..0000000 --- a/Assets/levitate.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: levitate - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index 804e6c3..990615f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,5 @@ { "dependencies": { - "com.coffee.unmask": "https://github.com/mob-sakai/UnmaskForUGUI.git", "com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", "com.unity.2d.sprite": "1.0.0", "com.unity.ide.visualstudio": "2.0.27", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ae4d359..fa07232 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,12 +1,5 @@ { "dependencies": { - "com.coffee.unmask": { - "version": "https://github.com/mob-sakai/UnmaskForUGUI.git", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "33356da2c43fa28397192baee70910c978e3169f" - }, "com.github-glitchenzo.nugetforunity": { "version": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", "depth": 0,