diff --git a/Zilon.Client/Assets/Editor.meta b/Zilon.Client/Assets/Editor.meta new file mode 100644 index 000000000..c44fda750 --- /dev/null +++ b/Zilon.Client/Assets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d80301f22cb7174dad938f930d80a6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs b/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs new file mode 100644 index 000000000..92c26ba5e --- /dev/null +++ b/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs @@ -0,0 +1,52 @@ +using UnityEngine; +using UnityEditor; +using UnityEditor.SceneManagement; + +[InitializeOnLoad] +public class AutoSaveOnRunMenuItem +{ + public const string MenuName = "Tools/Autosave On Run"; + private static bool isToggled; + + static AutoSaveOnRunMenuItem() + { + EditorApplication.delayCall += () => + { + isToggled = EditorPrefs.GetBool(MenuName, false); + UnityEditor.Menu.SetChecked(MenuName, isToggled); + SetMode(); + }; + } + + [MenuItem(MenuName)] + private static void ToggleMode() + { + isToggled = !isToggled; + UnityEditor.Menu.SetChecked(MenuName, isToggled); + EditorPrefs.SetBool(MenuName, isToggled); + SetMode(); + } + + private static void SetMode() + { + if (isToggled) + { + EditorApplication.playModeStateChanged += AutoSaveOnRun; + } + else + { + EditorApplication.playModeStateChanged -= AutoSaveOnRun; + } + } + + private static void AutoSaveOnRun(PlayModeStateChange state) + { + if (EditorApplication.isPlayingOrWillChangePlaymode && !EditorApplication.isPlaying) + { + Debug.Log("Auto-Saving before entering Play mode"); + + EditorSceneManager.SaveOpenScenes(); + AssetDatabase.SaveAssets(); + } + } +} \ No newline at end of file diff --git a/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs.meta b/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs.meta new file mode 100644 index 000000000..038ddc339 --- /dev/null +++ b/Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d7b39116cb504e4a8e5809e6ef2f2d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png b/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png index f158e671b..a44821ced 100644 Binary files a/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png and b/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png differ diff --git a/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png.meta b/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png.meta index fbd05f8d5..875c059c4 100644 --- a/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png.meta +++ b/Zilon.Client/Assets/Resources/Icons/props/closed-leather-helmet.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 4fcdd88e3be80f7468a43373c624458c +guid: 0feae8a53cdb3fe4ea95099d1d15a033 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -58,7 +58,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 32 resizeAlgorithm: 0 @@ -69,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 32 resizeAlgorithm: 0 @@ -80,17 +81,20 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 1aa8c0b9f30ca1f4383901db7eb52a3e + spriteID: e5b7aa66384d1114984743819459c25a + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png b/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png new file mode 100644 index 000000000..f158e671b Binary files /dev/null and b/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png differ diff --git a/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png.meta b/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png.meta new file mode 100644 index 000000000..de0c70b11 --- /dev/null +++ b/Zilon.Client/Assets/Resources/Icons/props/knitted-hat.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: f4e86be64b419ad43a4320a4f76363ae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png b/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png index a44821ced..d0b3bfcd3 100644 Binary files a/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png and b/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png differ diff --git a/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png.meta b/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png.meta index 1beb5ac54..49627a848 100644 --- a/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png.meta +++ b/Zilon.Client/Assets/Resources/Icons/props/leather-helmet.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 0feae8a53cdb3fe4ea95099d1d15a033 +guid: 99cb0eef89a321b4e8bc744f70aa94b4 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -58,39 +58,31 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 32 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 3 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 3 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: e5b7aa66384d1114984743819459c25a + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Zilon.Client/Assets/Resources/Schemes/DropTables/default.json b/Zilon.Client/Assets/Resources/Schemes/DropTables/default.json index 1cb7642cf..d495a4237 100644 --- a/Zilon.Client/Assets/Resources/Schemes/DropTables/default.json +++ b/Zilon.Client/Assets/Resources/Schemes/DropTables/default.json @@ -104,6 +104,11 @@ ] } ] + }, + { + "SchemeSid": "knitted-hat", + + "Weight": 10 }, { "SchemeSid": "leather-helmet", diff --git a/Zilon.Client/Assets/Resources/Schemes/DropTables/person-creation/start-heads.json b/Zilon.Client/Assets/Resources/Schemes/DropTables/person-creation/start-heads.json index 464ee8903..d8c42cf18 100644 --- a/Zilon.Client/Assets/Resources/Schemes/DropTables/person-creation/start-heads.json +++ b/Zilon.Client/Assets/Resources/Schemes/DropTables/person-creation/start-heads.json @@ -3,11 +3,19 @@ "Records": [ { "SchemeSid": "steel-helmet", - "Weight": 10 + "Weight": 5 }, { "SchemeSid": "leather-helmet", "Weight": 10 + }, + { + "SchemeSid": "closed-leather-helmet", + "Weight": 5 + }, + { + "SchemeSid": "knitted-hat", + "Weight": 10 }, { "SchemeSid": "wizard-hat", diff --git a/Zilon.Client/Assets/Resources/Schemes/DropTables/survival.json b/Zilon.Client/Assets/Resources/Schemes/DropTables/survival.json index 869570eb1..0ec3d7e8f 100644 --- a/Zilon.Client/Assets/Resources/Schemes/DropTables/survival.json +++ b/Zilon.Client/Assets/Resources/Schemes/DropTables/survival.json @@ -39,7 +39,7 @@ }, { "SchemeSid": null, - "Weight": 300 + "Weight": 600 } ] } \ No newline at end of file diff --git a/Zilon.Client/Assets/Resources/Schemes/Locations/rat-kingdom.json b/Zilon.Client/Assets/Resources/Schemes/Locations/rat-kingdom.json index 573afd40e..7efd53ad7 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Locations/rat-kingdom.json +++ b/Zilon.Client/Assets/Resources/Schemes/Locations/rat-kingdom.json @@ -27,24 +27,24 @@ { "Sid": "lvl2", "Name":{ - "En": "Rat Kingdom Suare" + "En": "Rat Kingdom Square" }, "RegularMonsterSids": ["rat", "bat"], "RareMonsterSids": ["rat-mutant", "moon-rat"], - "ChampionMonsterSids": null, + "ChampionMonsterSids": ["rat-human-slayer", "night-stalker"], "RegionCount": 10, "RegionSize": 5, "RegionMonsterCount": 5, - "TransSectorSids": ["lvl3", "lvl-barracks"], + "TransSectorSids": ["lvl-throne", "lvl-barracks"], "TotalChestCount": 20, "RegionChestCountRatio": 9, "ChestDropTableSids": ["survival", "default"] }, { - "Sid": "lvl3", + "Sid": "lvl-throne", "Name":{ "En": "Rat Kingdom Throne" }, @@ -77,7 +77,7 @@ "RegionChestCountRatio": 9, "ChestDropTableSids": ["survival", "default"], - "TransSectorSids": ["lvl3", "lvl-barracks"] + "TransSectorSids": ["lvl-throne", "lvl-barracks"] } ] } \ No newline at end of file diff --git a/Zilon.Client/Assets/Resources/Schemes/Persons/human-person.json b/Zilon.Client/Assets/Resources/Schemes/Persons/human-person.json index efe81dc7a..f99ae6f63 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Persons/human-person.json +++ b/Zilon.Client/Assets/Resources/Schemes/Persons/human-person.json @@ -26,5 +26,67 @@ { "Types": "Aux" } + ], + "SurvivalStats": [ + { + "Type": "Satiety", + "MinValue": -3000, + "MaxValue": 500, + "StartValue": 250, + "KeyPoints": [ + { + "Level": "Lesser", + "Value": 0 + }, + { + "Level": "Strong", + "Value": -360 + }, + { + "Level": "Max", + "Value": -2520 + } + ] + }, + { + "Type": "Hydration", + "MinValue": -1200, + "MaxValue": 130, + "StartValue": 100, + "KeyPoints": [ + { + "Level": "Lesser", + "Value": 0 + }, + { + "Level": "Strong", + "Value": -180 + }, + { + "Level": "Max", + "Value": -1080 + } + ] + }, + { + "Type": "Intoxication", + "MinValue": 0, + "MaxValue": 130, + "StartValue": 0, + "KeyPoints": [ + { + "Level": "Lesser", + "Value": 30 + }, + { + "Level": "Strong", + "Value": 60 + }, + { + "Level": "Max", + "Value": 111 + } + ] + } ] } \ No newline at end of file diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/med-kit.json b/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/med-kit.json index bfa71c14c..4e457907f 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/med-kit.json +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/med-kit.json @@ -8,17 +8,11 @@ "CommonRules": [ { "Type": "Health", - "Level": "Normal" - }, - { - "Type": "Thirst", - "Level": "Lesser", - "Direction": "Negative" + "Level": "Grand" }, { - "Type": "Satiety", - "Level": "Lesser", - "Direction": "Negative" + "Type": "Intoxication", + "Level": "Normal" } ] } diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/northerner-ale.json b/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/northerner-ale.json index b5c8f239a..0b616d8fe 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/northerner-ale.json +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Consumables/northerner-ale.json @@ -1,7 +1,7 @@ { "Name": { "En": "Northerner Ale", - "Ru": "Эль серерян" + "Ru": "Эль северян" }, "Use": { "Consumable": true, @@ -18,6 +18,11 @@ "Type": "Satiety", "Level": "Lesser", "Direction": "Negative" + }, + { + "Type": "Intoxication", + "Level": "Lesser", + "Direction": "Negative" } ] } diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/closed-leather-helmet.json b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/closed-leather-helmet.json index 340481d55..d2aea8dd5 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/closed-leather-helmet.json +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/closed-leather-helmet.json @@ -6,7 +6,7 @@ { "Impact": "Kinetic", "AbsorbtionLevel": "Lesser", - "ArmorRank": 1 + "ArmorRank": 3 } ] }, diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json new file mode 100644 index 000000000..dc374f015 --- /dev/null +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json @@ -0,0 +1,17 @@ +{ + "Tags": [ "armor" ], + "Equip": { + "SlotTypes": [ "Head" ], + "Armors": [ + { + "Impact": "Kinetic", + "AbsorbtionLevel": "Lesser", + "ArmorRank": 1 + } + ] + }, + "Name": { + "En": "Knitted Hat", + "Ru": "Вязанная шапка" + } +} \ No newline at end of file diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json.meta b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json.meta new file mode 100644 index 000000000..88da765a6 --- /dev/null +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/knitted-hat.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ba7150c2f36d97941a2137d39d0eda11 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/leather-helmet.json b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/leather-helmet.json index 826300fc7..333c3b99c 100644 --- a/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/leather-helmet.json +++ b/Zilon.Client/Assets/Resources/Schemes/Props/Equipments/leather-helmet.json @@ -6,7 +6,7 @@ { "Impact": "Kinetic", "AbsorbtionLevel": "Lesser", - "ArmorRank": 1 + "ArmorRank": 2 } ] }, diff --git a/Zilon.Client/Assets/Resources/VisualProps/closed-leather-helmet.prefab b/Zilon.Client/Assets/Resources/VisualProps/closed-leather-helmet.prefab index 7b62ffbd9..3488b9705 100644 --- a/Zilon.Client/Assets/Resources/VisualProps/closed-leather-helmet.prefab +++ b/Zilon.Client/Assets/Resources/VisualProps/closed-leather-helmet.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3354080010024306757 +--- !u!1 &4132850236043702362 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,8 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 443170653808762914} - - component: {fileID: 8044157495786864287} + - component: {fileID: 690919070668692626} + - component: {fileID: 2756468058446706651} m_Layer: 0 m_Name: GameObject m_TagString: Untagged @@ -17,108 +17,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &443170653808762914 +--- !u!4 &690919070668692626 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354080010024306757} + m_GameObject: {fileID: 4132850236043702362} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.005, y: 0.051, z: -0.0001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4038037901759682} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8044157495786864287 +--- !u!212 &2756468058446706651 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3354080010024306757} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 2a2dce1177dc9eb4d81eaed99a00dd41, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.26039064, y: 0.33} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &4952218022666211867 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 333198387410233978} - - component: {fileID: 6123867119234610327} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &333198387410233978 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4952218022666211867} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.01, y: 0.07, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4038037901759682} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6123867119234610327 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4952218022666211867} + m_GameObject: {fileID: 4132850236043702362} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -151,7 +70,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 11 - m_Sprite: {fileID: 21300000, guid: 4fcdd88e3be80f7468a43373c624458c, type: 3} + m_Sprite: {fileID: 21300000, guid: 0feae8a53cdb3fe4ea95099d1d15a033, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -169,6 +88,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3948944916926042920, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Name + value: closed-leather-helmet + objectReference: {fileID: 0} - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} propertyPath: m_LocalPosition.x @@ -224,16 +148,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3948944916926042920, guid: dd95a8a0e72f45d46a65c062235de2ee, - type: 3} - propertyPath: m_Name - value: closed-leather-helmet - objectReference: {fileID: 0} - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4fcdd88e3be80f7468a43373c624458c, + objectReference: {fileID: 21300000, guid: 0feae8a53cdb3fe4ea95099d1d15a033, type: 3} - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} @@ -268,3 +187,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3947826872104161724} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9042963630005465201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4038037901759682} + m_Modifications: + - target: {fileID: 895194747557695639, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_Name + value: none-head + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 893403323497252545, guid: 13f489f1f421cdd4392d6b51151cd9e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 13f489f1f421cdd4392d6b51151cd9e9, type: 3} diff --git a/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab b/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab new file mode 100644 index 000000000..b3420df8a --- /dev/null +++ b/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab @@ -0,0 +1,351 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3354080010024306757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 443170653808762914} + - component: {fileID: 8044157495786864287} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &443170653808762914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3354080010024306757} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4038037901759682} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8044157495786864287 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3354080010024306757} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 2a2dce1177dc9eb4d81eaed99a00dd41, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.26039064, y: 0.33} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3753433363606375049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2966528316711685878} + - component: {fileID: 7446417585332075766} + m_Layer: 0 + m_Name: GameObject front + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2966528316711685878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753433363606375049} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01, y: 0.024, z: -0.0001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4038037901759682} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7446417585332075766 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753433363606375049} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 8582d926e54d5cb459068c94869eb764, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.34, y: 0.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4952218022666211867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 333198387410233978} + - component: {fileID: 6123867119234610327} + m_Layer: 0 + m_Name: GameObject back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &333198387410233978 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4952218022666211867} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.01, y: 0.024000002, z: 0.0001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4038037901759682} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6123867119234610327 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4952218022666211867} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4fcdd88e3be80f7468a43373c624458c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.34, y: 0.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &3947826872104161724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3948944916926042920, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Name + value: closed-leather-helmet + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4fcdd88e3be80f7468a43373c624458c, + type: 3} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Size.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Size.y + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} +--- !u!4 &4038037901759682 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + m_PrefabInstance: {fileID: 3947826872104161724} + m_PrefabAsset: {fileID: 0} diff --git a/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab.meta b/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab.meta new file mode 100644 index 000000000..222406a08 --- /dev/null +++ b/Zilon.Client/Assets/Resources/VisualProps/knitted-hat.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b8cd253d57e5e74197ee5a95b3d4358 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab b/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab index 0579eab72..c116f243c 100644 --- a/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab +++ b/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4132850236043702362} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.005, y: 0.051, z: 0} + m_LocalPosition: {x: -0.008, y: 0.048, z: -0.00001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4038037901759682} @@ -70,7 +70,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 11 - m_Sprite: {fileID: 21300000, guid: 0feae8a53cdb3fe4ea95099d1d15a033, type: 3} + m_Sprite: {fileID: 21300000, guid: 99cb0eef89a321b4e8bc744f70aa94b4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -88,6 +88,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3948944916926042920, guid: dd95a8a0e72f45d46a65c062235de2ee, + type: 3} + propertyPath: m_Name + value: leather-helmet + objectReference: {fileID: 0} - target: {fileID: 3947166536749008254, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} propertyPath: m_LocalPosition.x @@ -143,11 +148,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3948944916926042920, guid: dd95a8a0e72f45d46a65c062235de2ee, - type: 3} - propertyPath: m_Name - value: leather-helmet - objectReference: {fileID: 0} - target: {fileID: 3764418354155932040, guid: dd95a8a0e72f45d46a65c062235de2ee, type: 3} propertyPath: m_Sprite diff --git a/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab.meta b/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab.meta index 18ebc250a..372327b62 100644 --- a/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab.meta +++ b/Zilon.Client/Assets/Resources/VisualProps/leather-helmet.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21638ed250f631146aa1e7de6f5d6c15 +guid: 6744a69a79d84844f8042c0214efcff4 PrefabImporter: externalObjects: {} userData: diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Common/EffectViewModel.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Common/EffectViewModel.prefab index 04d057cd0..1f1d3d4cf 100644 --- a/Zilon.Client/Assets/Zilon/Prefabs/Common/EffectViewModel.prefab +++ b/Zilon.Client/Assets/Zilon/Prefabs/Common/EffectViewModel.prefab @@ -85,6 +85,7 @@ MonoBehaviour: NameText: {fileID: 3810033343488556025} HungerSprite: {fileID: 21300000, guid: 69b5169aed016d84a92c951bfa1e974f, type: 3} ThristSprite: {fileID: 21300000, guid: dd18b85fa6f2c4546a07ce7d47fde67a, type: 3} + IntoxicationSprite: {fileID: 21300000, guid: 7435ccb2a8741f248bd74b9b00629f32, type: 3} --- !u!1 &1578793237884679211 GameObject: m_ObjectHideFlags: 0 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab new file mode 100644 index 000000000..09094b456 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab @@ -0,0 +1,375 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2635179049708252236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2635179049708252237} + - component: {fileID: 2635179049708252238} + - component: {fileID: 5666991892573113761} + m_Layer: 5 + m_Name: WebUrlButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2635179049708252237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179049708252236} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 358553599566522466} + m_Father: {fileID: 0} + m_RootOrder: 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: 292.46, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2635179049708252238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179049708252236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_MethodName: OpenRepoUrlHandler + 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 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &5666991892573113761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179049708252236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 30 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &2635179050410849172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2635179050410849173} + - component: {fileID: 2635179050410849175} + - component: {fileID: 2635179050410849174} + - component: {fileID: 9065665138720055636} + m_Layer: 5 + m_Name: UrlText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2635179050410849173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179050410849172} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 358553599566522466} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2635179050410849175 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179050410849172} + m_CullTransparentMesh: 0 +--- !u!114 &2635179050410849174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179050410849172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: GitHub Page +--- !u!114 &9065665138720055636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2635179050410849172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 250 + m_MinHeight: 30 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4008945519361148571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5608862942731024723} + - component: {fileID: 4449564157589176507} + - component: {fileID: 3656590226447628629} + - component: {fileID: 4419920705349404031} + m_Layer: 5 + m_Name: LogoImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5608862942731024723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4008945519361148571} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 358553599566522466} + m_RootOrder: 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4449564157589176507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4008945519361148571} + m_CullTransparentMesh: 0 +--- !u!114 &3656590226447628629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4008945519361148571} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7e85c7ca3eafba546bcbb2cc16666a4e, 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 &4419920705349404031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4008945519361148571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 24 + m_MinHeight: 24 + m_PreferredWidth: 24 + m_PreferredHeight: 24 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &8279136844439034895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 358553599566522466} + - component: {fileID: 440747203110497942} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &358553599566522466 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279136844439034895} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5608862942731024723} + - {fileID: 2635179050410849173} + m_Father: {fileID: 2635179049708252237} + m_RootOrder: 0 + 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!114 &440747203110497942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279136844439034895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab.meta b/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab.meta new file mode 100644 index 000000000..2c1d0df3f --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Common/WebUrlButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da80eb938175d4b418729bbf0135842f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab new file mode 100644 index 000000000..5b74230fb --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab @@ -0,0 +1,484 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1259930172181120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224349689887339630} + - component: {fileID: 222305031037658728} + - component: {fileID: 114947343969481852} + - component: {fileID: 3115348814729585057} + m_Layer: 5 + m_Name: CountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224349689887339630 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259930172181120} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224252598164177488} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -3, y: 3} + m_SizeDelta: {x: 34.34, y: 20} + m_Pivot: {x: 1, y: 0} +--- !u!222 &222305031037658728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259930172181120} + m_CullTransparentMesh: 0 +--- !u!114 &114947343969481852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259930172181120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 15 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 15 + m_Alignment: 8 + m_AlignByGeometry: 1 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!114 &3115348814729585057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259930172181120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &1334817854532730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224252598164177488} + - component: {fileID: 222382046387460118} + - component: {fileID: 1744148937314468465} + m_Layer: 5 + m_Name: DraggedPropItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224252598164177488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334817854532730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1599855444157881490} + - {fileID: 6667016723327313351} + - {fileID: 224349689887339630} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222382046387460118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334817854532730} + m_CullTransparentMesh: 0 +--- !u!114 &1744148937314468465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334817854532730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01b8078c9b2be094785bb1db7269d26b, type: 3} + m_Name: + m_EditorClassIdentifier: + CountText: {fileID: 114947343969481852} + DurableStatusText: {fileID: 5579134216474126389} + IconImage: {fileID: 3290174707520902986} + SelectedBorder: {fileID: 114763604444658502} + Sid: +--- !u!1 &1560117523154470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224032876147183850} + - component: {fileID: 222577718222607588} + - component: {fileID: 114763604444658502} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &224032876147183850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560117523154470} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1599855444157881490} + m_RootOrder: 0 + 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 &222577718222607588 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560117523154470} + m_CullTransparentMesh: 0 +--- !u!114 &114763604444658502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560117523154470} + 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: 1, b: 0.013333321, a: 0.09803922} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 36e485aa5939e5d45ac4c9ff925795f3, 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: 1 +--- !u!1 &4669710176389779490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6667016723327313351} + - component: {fileID: 4636988156661760064} + - component: {fileID: 5579134216474126389} + - component: {fileID: 2908525282805562270} + m_Layer: 5 + m_Name: DurableStatusText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6667016723327313351 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4669710176389779490} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224252598164177488} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -3, y: 3} + m_SizeDelta: {x: 34.34, y: 20} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4636988156661760064 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4669710176389779490} + m_CullTransparentMesh: 0 +--- !u!114 &5579134216474126389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4669710176389779490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 15 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 15 + m_Alignment: 8 + m_AlignByGeometry: 1 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: B +--- !u!114 &2908525282805562270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4669710176389779490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &7521195676036398595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4830487652827357007} + - component: {fileID: 1421928569269065402} + - component: {fileID: 3290174707520902986} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4830487652827357007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521195676036398595} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1599855444157881490} + m_RootOrder: 1 + 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: -8, y: -8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1421928569269065402 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521195676036398595} + m_CullTransparentMesh: 0 +--- !u!114 &3290174707520902986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521195676036398595} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 &8785967333808170339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599855444157881490} + - component: {fileID: 5340322957657834248} + - component: {fileID: 1966326386062034657} + m_Layer: 5 + m_Name: backgroud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599855444157881490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785967333808170339} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224032876147183850} + - {fileID: 4830487652827357007} + m_Father: {fileID: 224252598164177488} + m_RootOrder: 0 + 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 &5340322957657834248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785967333808170339} + m_CullTransparentMesh: 0 +--- !u!114 &1966326386062034657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785967333808170339} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab.meta b/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab.meta new file mode 100644 index 000000000..b705e643a --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Modals/DraggedPropItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f74069ac61475f9488e2bf1993a82297 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Modals/EquipmentSlot.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Modals/EquipmentSlot.prefab index f434d410b..41f26ae16 100644 --- a/Zilon.Client/Assets/Zilon/Prefabs/Modals/EquipmentSlot.prefab +++ b/Zilon.Client/Assets/Zilon/Prefabs/Modals/EquipmentSlot.prefab @@ -89,6 +89,8 @@ GameObject: - component: {fileID: 114889429254206848} - component: {fileID: 114999057452803224} - component: {fileID: 4063666282255933052} + - component: {fileID: 2547320450842014439} + - component: {fileID: 2319514356437487859} m_Layer: 5 m_Name: EquipmentSlot m_TagString: Untagged @@ -145,6 +147,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 9155e055b7ee49f4cbdabd4b1ee4c15a, type: 3} - {fileID: 21300000, guid: f599478103ed1ce4a8733fbaa75132c0, type: 3} - {fileID: 21300000, guid: 2bbeafd6942b10d4a8a90fae5fcb7df9, type: 3} + SelectAsDrag: 0 --- !u!114 &114889429254206848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -247,6 +250,34 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 32, y: 32} m_EdgeRadius: 0 +--- !u!114 &2547320450842014439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168523480684566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bd9b8fd20663df4c95d29effdfde25e, type: 3} + m_Name: + m_EditorClassIdentifier: + InventorySlotViewModel: {fileID: 114484836081510712} +--- !u!114 &2319514356437487859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168523480684566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8729f2ceb489e1d41a95667219e8a1d2, type: 3} + m_Name: + m_EditorClassIdentifier: + DraggedPropItemPrefab: {fileID: 1744148937314468465, guid: f74069ac61475f9488e2bf1993a82297, + type: 3} + InventorySlotViewModel: {fileID: 114484836081510712} --- !u!1 &1331298518315526 GameObject: m_ObjectHideFlags: 0 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Modals/PropItem.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Modals/InventoryPropItem.prefab similarity index 94% rename from Zilon.Client/Assets/Zilon/Prefabs/Modals/PropItem.prefab rename to Zilon.Client/Assets/Zilon/Prefabs/Modals/InventoryPropItem.prefab index 6ca908677..0fa29d3ba 100644 --- a/Zilon.Client/Assets/Zilon/Prefabs/Modals/PropItem.prefab +++ b/Zilon.Client/Assets/Zilon/Prefabs/Modals/InventoryPropItem.prefab @@ -107,10 +107,12 @@ GameObject: - component: {fileID: 222382046387460118} - component: {fileID: 114141640806079984} - component: {fileID: 114613642215259830} + - component: {fileID: 5218126167900660358} + - component: {fileID: 5500246394821530162} - component: {fileID: 114523437291462436} - component: {fileID: 3070233913686231622} m_Layer: 5 - m_Name: PropItem + m_Name: InventoryPropItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -183,6 +185,35 @@ MonoBehaviour: IconImage: {fileID: 3290174707520902986} SelectedBorder: {fileID: 114763604444658502} Sid: + SelectAsDrag: 0 +--- !u!114 &5218126167900660358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334817854532730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01e402c6f908ae44c9e31ad4f428e155, type: 3} + m_Name: + m_EditorClassIdentifier: + PropItemViewModel: {fileID: 114613642215259830} +--- !u!114 &5500246394821530162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334817854532730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c51c36dc9849767498db36a1634534f4, type: 3} + m_Name: + m_EditorClassIdentifier: + PropItemViewModel: {fileID: 114613642215259830} + DraggedPropItemPrefab: {fileID: 1744148937314468465, guid: f74069ac61475f9488e2bf1993a82297, + type: 3} --- !u!114 &114523437291462436 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Modals/PropItem.prefab.meta b/Zilon.Client/Assets/Zilon/Prefabs/Modals/InventoryPropItem.prefab.meta similarity index 100% rename from Zilon.Client/Assets/Zilon/Prefabs/Modals/PropItem.prefab.meta rename to Zilon.Client/Assets/Zilon/Prefabs/Modals/InventoryPropItem.prefab.meta diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Scores.meta b/Zilon.Client/Assets/Zilon/Prefabs/Scores.meta new file mode 100644 index 000000000..6c879eca4 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Scores.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ef75643c4d980448ba299b825be1a99 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab b/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab new file mode 100644 index 000000000..3e8959f71 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab @@ -0,0 +1,2019 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &686180539854255725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695418331442386211} + - component: {fileID: 8683426168157557876} + - component: {fileID: 8600004468447686586} + - component: {fileID: 2719301972728445195} + m_Layer: 5 + m_Name: Separator (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1695418331442386211 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686180539854255725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 3 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8683426168157557876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686180539854255725} + m_CullTransparentMesh: 0 +--- !u!114 &8600004468447686586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686180539854255725} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &2719301972728445195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686180539854255725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &760726817652949711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6926517975274706006} + - component: {fileID: 703204973513942527} + - component: {fileID: 427152657404674075} + - component: {fileID: 3632179348602774960} + - component: {fileID: 8112916654620749863} + m_Layer: 5 + m_Name: ArchieventsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6926517975274706006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760726817652949711} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 10 + 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: 168.6, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &703204973513942527 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760726817652949711} + m_CullTransparentMesh: 0 +--- !u!114 &427152657404674075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760726817652949711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Home Found +--- !u!114 &3632179348602774960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760726817652949711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &8112916654620749863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760726817652949711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1022349730612124113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7891310697771560140} + - component: {fileID: 448782356953653418} + - component: {fileID: 8527513820927610153} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7891310697771560140 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022349730612124113} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1514400536139652193} + m_RootOrder: 0 + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &448782356953653418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022349730612124113} + m_CullTransparentMesh: 0 +--- !u!114 &8527513820927610153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022349730612124113} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ba8fb31c732c09942885f3472f3cb79a, 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 &1138577316924975817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3481259594869091781} + - component: {fileID: 6083647230002969482} + m_Layer: 5 + m_Name: Actions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3481259594869091781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138577316924975817} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3262364301171163333} + - {fileID: 8717630670622761576} + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 12 + 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: 73.8, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6083647230002969482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138577316924975817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 32, y: 32} + m_Spacing: {x: 5, y: 5} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &1624488459925529849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6724633284097028359} + - component: {fileID: 1415646741474393943} + - component: {fileID: 6338886979545936432} + - component: {fileID: 4681236523031120759} + m_Layer: 5 + m_Name: ScoresRecord + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6724633284097028359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624488459925529849} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4801413064544620392} + m_Father: {fileID: 0} + m_RootOrder: 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: 0, y: 60} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1415646741474393943 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624488459925529849} + m_CullTransparentMesh: 0 +--- !u!114 &6338886979545936432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624488459925529849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &4681236523031120759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624488459925529849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 85e65c1f43304374a924ce1d4dee160b, type: 3} + m_Name: + m_EditorClassIdentifier: + NumberText: {fileID: 8144581373811961465} + NameText: {fileID: 7567984931682164675} + ScoresText: {fileID: 683462923162137235} + DeathReasonText: {fileID: 13075232710755472} + ArcheventsText: {fileID: 427152657404674075} +--- !u!1 &2072795378208727986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3262364301171163333} + - component: {fileID: 3396551483620176305} + - component: {fileID: 4513544376735454347} + - component: {fileID: 6706405129676046788} + m_Layer: 5 + m_Name: TextSummaryButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3262364301171163333 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072795378208727986} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6561754506500562610} + m_Father: {fileID: 3481259594869091781} + m_RootOrder: 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: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3396551483620176305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072795378208727986} + m_CullTransparentMesh: 0 +--- !u!114 &4513544376735454347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072795378208727986} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!114 &6706405129676046788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072795378208727986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4513544376735454347} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &2650442020895116453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8355115435144174956} + - component: {fileID: 8583748992988687769} + - component: {fileID: 7567984931682164675} + - component: {fileID: 4983525972853243566} + - component: {fileID: 3643630304769918307} + m_Layer: 5 + m_Name: NameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8355115435144174956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2650442020895116453} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 4 + 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: 214.9, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8583748992988687769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2650442020895116453} + m_CullTransparentMesh: 0 +--- !u!114 &7567984931682164675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2650442020895116453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Dornubus +--- !u!114 &4983525972853243566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2650442020895116453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3643630304769918307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2650442020895116453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &3791977610903541134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6864369305992230761} + - component: {fileID: 66316140823228443} + - component: {fileID: 449740627842239142} + - component: {fileID: 576417915947877766} + m_Layer: 5 + m_Name: Separator (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6864369305992230761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791977610903541134} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 9 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &66316140823228443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791977610903541134} + m_CullTransparentMesh: 0 +--- !u!114 &449740627842239142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791977610903541134} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &576417915947877766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791977610903541134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4202699525012505089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1514400536139652193} + - component: {fileID: 4132931712586993822} + - component: {fileID: 7303492554714079190} + - component: {fileID: 19400082594263536} + m_Layer: 5 + m_Name: PhotoPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1514400536139652193 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202699525012505089} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7891310697771560140} + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 2 + 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: 60, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4132931712586993822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202699525012505089} + m_CullTransparentMesh: 0 +--- !u!114 &7303492554714079190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202699525012505089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 &19400082594263536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202699525012505089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 60 + m_MinHeight: 60 + m_PreferredWidth: 60 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4790367307323421023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9522096343441885} + - component: {fileID: 5085366096780933825} + - component: {fileID: 683462923162137235} + - component: {fileID: 50691749032333829} + - component: {fileID: 7396798775547477286} + m_Layer: 5 + m_Name: ScoresText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9522096343441885 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4790367307323421023} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 6 + 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: 134.5, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5085366096780933825 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4790367307323421023} + m_CullTransparentMesh: 0 +--- !u!114 &683462923162137235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4790367307323421023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Scores: 10000' +--- !u!114 &50691749032333829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4790367307323421023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &7396798775547477286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4790367307323421023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4874651406785122923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8221013138279534733} + - component: {fileID: 739128066167695462} + - component: {fileID: 2746784742629051037} + - component: {fileID: 2257008582242593676} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8221013138279534733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4874651406785122923} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 7 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &739128066167695462 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4874651406785122923} + m_CullTransparentMesh: 0 +--- !u!114 &2746784742629051037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4874651406785122923} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &2257008582242593676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4874651406785122923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4969360017629959325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8717630670622761576} + - component: {fileID: 6680539388530344986} + - component: {fileID: 7563285020339918515} + - component: {fileID: 29088067911395571} + m_Layer: 5 + m_Name: RemoveButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8717630670622761576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4969360017629959325} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4224573410493521077} + m_Father: {fileID: 3481259594869091781} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6680539388530344986 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4969360017629959325} + m_CullTransparentMesh: 0 +--- !u!114 &7563285020339918515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4969360017629959325} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!114 &29088067911395571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4969360017629959325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7563285020339918515} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &5358481059124523156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4224573410493521077} + - component: {fileID: 8631584237461356636} + - component: {fileID: 9023035014441982700} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4224573410493521077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358481059124523156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8717630670622761576} + m_RootOrder: 0 + 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 &8631584237461356636 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358481059124523156} + m_CullTransparentMesh: 0 +--- !u!114 &9023035014441982700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358481059124523156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: R +--- !u!1 &6237518417871304865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6561754506500562610} + - component: {fileID: 7629409010137309055} + - component: {fileID: 6695437325950648487} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6561754506500562610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6237518417871304865} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3262364301171163333} + m_RootOrder: 0 + 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 &7629409010137309055 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6237518417871304865} + m_CullTransparentMesh: 0 +--- !u!114 &6695437325950648487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6237518417871304865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: D +--- !u!1 &6425999341681332704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4801413064544620392} + - component: {fileID: 8133963674811153264} + - component: {fileID: 1126362337839979335} + - component: {fileID: 7416887338233623338} + m_Layer: 5 + m_Name: TableRow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4801413064544620392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6425999341681332704} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8490080412609771028} + - {fileID: 2429324749889551911} + - {fileID: 1514400536139652193} + - {fileID: 1695418331442386211} + - {fileID: 8355115435144174956} + - {fileID: 5770600209829344255} + - {fileID: 9522096343441885} + - {fileID: 8221013138279534733} + - {fileID: 1566761671668915403} + - {fileID: 6864369305992230761} + - {fileID: 6926517975274706006} + - {fileID: 7284902978072329253} + - {fileID: 3481259594869091781} + m_Father: {fileID: 6724633284097028359} + m_RootOrder: 0 + 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 &8133963674811153264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6425999341681332704} + m_CullTransparentMesh: 0 +--- !u!114 &1126362337839979335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6425999341681332704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 &7416887338233623338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6425999341681332704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &6667132206176489246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8490080412609771028} + - component: {fileID: 5456540600212913938} + - component: {fileID: 8144581373811961465} + - component: {fileID: 674157657818509191} + - component: {fileID: 3405228215574597234} + m_Layer: 5 + m_Name: NumberText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8490080412609771028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667132206176489246} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 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: 78.2, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5456540600212913938 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667132206176489246} + m_CullTransparentMesh: 0 +--- !u!114 &8144581373811961465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667132206176489246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '#1' +--- !u!114 &674157657818509191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667132206176489246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3405228215574597234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6667132206176489246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7231027530030863147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5770600209829344255} + - component: {fileID: 3852360152271445675} + - component: {fileID: 3296566587123973211} + - component: {fileID: 6064823115233914709} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5770600209829344255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231027530030863147} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 5 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3852360152271445675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231027530030863147} + m_CullTransparentMesh: 0 +--- !u!114 &3296566587123973211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231027530030863147} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &6064823115233914709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7231027530030863147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7575365147216848134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7284902978072329253} + - component: {fileID: 3944280355647414737} + - component: {fileID: 6393536428820538919} + - component: {fileID: 2523135332606604143} + m_Layer: 5 + m_Name: Separator (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7284902978072329253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575365147216848134} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 11 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944280355647414737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575365147216848134} + m_CullTransparentMesh: 0 +--- !u!114 &6393536428820538919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575365147216848134} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &2523135332606604143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575365147216848134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7587010883880905994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2429324749889551911} + - component: {fileID: 1376486105301367685} + - component: {fileID: 8399995289819682181} + - component: {fileID: 5036663803968433057} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2429324749889551911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7587010883880905994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 1 + 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: 2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1376486105301367685 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7587010883880905994} + m_CullTransparentMesh: 0 +--- !u!114 &8399995289819682181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7587010883880905994} + 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.91764706, g: 0.7529412, b: 0.5254902, a: 0.44705883} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!114 &5036663803968433057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7587010883880905994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &8289919350714906143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1566761671668915403} + - component: {fileID: 6452833513778187140} + - component: {fileID: 13075232710755472} + - component: {fileID: 7541185663446592220} + - component: {fileID: 2036652074389640025} + m_Layer: 5 + m_Name: DeathReasonText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1566761671668915403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289919350714906143} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4801413064544620392} + m_RootOrder: 8 + 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: 196, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6452833513778187140 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289919350714906143} + m_CullTransparentMesh: 0 +--- !u!114 &13075232710755472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289919350714906143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Death Reason: + + Hunger' +--- !u!114 &7541185663446592220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289919350714906143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 60 + m_PreferredWidth: -1 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &2036652074389640025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289919350714906143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab.meta b/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab.meta new file mode 100644 index 000000000..3d9695e22 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Prefabs/Scores/ScoresRecord.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3faa1552151bc0c4abf3fe1d4fe6f19b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scenes/combat.unity b/Zilon.Client/Assets/Zilon/Scenes/combat.unity index 442287c6d..5103b89f6 100644 --- a/Zilon.Client/Assets/Zilon/Scenes/combat.unity +++ b/Zilon.Client/Assets/Zilon/Scenes/combat.unity @@ -377,6 +377,160 @@ MonoBehaviour: type: 3} BlockSparksPrefab: {fileID: 5693981553541839669, guid: 8499d56e88c77d548b5fc26f815893c0, type: 3} +--- !u!1 &185488349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 185488350} + - component: {fileID: 185488354} + - component: {fileID: 185488353} + - component: {fileID: 185488352} + - component: {fileID: 185488351} + m_Layer: 5 + m_Name: CityQuickExit_Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &185488350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185488349} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002667, y: 1.0002667, z: 1.0002667} + m_Children: + - {fileID: 1964361737} + m_Father: {fileID: 787514921} + m_RootOrder: 4 + 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: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &185488351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185488349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 60 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &185488352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185488349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 185488353} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 227365886} + m_MethodName: CityQuickExit_Handler + 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 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &185488353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185488349} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!222 &185488354 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185488349} + m_CullTransparentMesh: 0 --- !u!1 &187834198 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +711,7 @@ MonoBehaviour: InventoryButton: {fileID: 1793996589} PersonButton: {fileID: 1724347674} SectorTransitionMoveButton: {fileID: 299468032} + CityQuickExitButton: {fileID: 185488352} --- !u!114 &227365887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1066,6 +1221,85 @@ MonoBehaviour: AudioSource: {fileID: 418371950} PacificMusic: {fileID: 8300000, guid: 0d73f3bab30296e45a8d3dcdd3a3e2c4, type: 3} DungeionMusic: {fileID: 8300000, guid: 4b0de299cb087714fbcabc0f76f37c0d, type: 3} +--- !u!1 &491101794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491101795} + - component: {fileID: 491101797} + - component: {fileID: 491101796} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &491101795 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491101794} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99997145, y: 0.99997145, z: 0.99997145} + m_Children: [] + m_Father: {fileID: 564020840} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &491101796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491101794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: a8091ce330da38546be2451b8ef9254e, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '[Drop to de-equip]' +--- !u!222 &491101797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491101794} + m_CullTransparentMesh: 0 --- !u!1 &544933904 GameObject: m_ObjectHideFlags: 0 @@ -1162,6 +1396,95 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0, b: 0.16892958, a: 0.7647059} m_EffectDistance: {x: 2, y: 2} m_UseGraphicAlpha: 1 +--- !u!1 &564020839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 564020840} + - component: {fileID: 564020843} + - component: {fileID: 564020842} + - component: {fileID: 564020841} + m_Layer: 5 + m_Name: InventoryDropArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &564020840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 564020839} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99977845, y: 0.99977845, z: 0.99977845} + m_Children: + - {fileID: 491101795} + m_Father: {fileID: 415948494916139211} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -122.96, y: -95.97} + m_SizeDelta: {x: 248.97, y: -215.86} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &564020841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 564020839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fa52e38b72816544bee9991d66e0d26, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &564020842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 564020839} + 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.61209506, g: 0.990566, b: 0.62235796, a: 0.48235294} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!222 &564020843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 564020839} + m_CullTransparentMesh: 0 --- !u!1 &619487360 GameObject: m_ObjectHideFlags: 0 @@ -1338,6 +1661,7 @@ RectTransform: - {fileID: 1793996588} - {fileID: 1724347678} - {fileID: 299468030} + - {fileID: 185488350} - {fileID: 845442079} m_Father: {fileID: 227365885} m_RootOrder: 0 @@ -1345,7 +1669,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: -5} - m_SizeDelta: {x: 261.9, y: 64.5} + m_SizeDelta: {x: 406.4, y: 64.5} m_Pivot: {x: 0, y: 1} --- !u!114 &787514922 MonoBehaviour: @@ -1440,7 +1764,7 @@ RectTransform: m_Children: - {fileID: 149406864} m_Father: {fileID: 787514921} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2017,49 +2341,199 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1272584967} + m_GameObject: {fileID: 1272584967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1272584972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272584967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9305f4a0dda322c43a9a746952aaf025, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1272584973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272584967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EventMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxRayIntersections: 0 +--- !u!224 &1306163356 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224829893533863880, guid: a7048ab047ca87f4484bd8908232d163, + type: 3} + m_PrefabInstance: {fileID: 1800231175} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1314784216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1314784217} + - component: {fileID: 1314784219} + - component: {fileID: 1314784218} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1314784217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314784216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1809942183} + m_RootOrder: 0 + 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: 3.209999} + m_SizeDelta: {x: 0, y: 6.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1314784218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314784216} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!222 &1314784219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314784216} + m_CullTransparentMesh: 0 +--- !u!1 &1353525439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1353525440} + - component: {fileID: 1353525442} + - component: {fileID: 1353525441} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1353525440 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1353525439} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 415948494916139211} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1272584972 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.4985046, y: -1.949997} + m_SizeDelta: {x: 248.92, y: 3.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1353525441 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1272584967} + m_GameObject: {fileID: 1353525439} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9305f4a0dda322c43a9a746952aaf025, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1272584973 -MonoBehaviour: + m_Material: {fileID: 0} + m_Color: {r: 0.3532396, g: 0.47681862, b: 0.509434, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 36e485aa5939e5d45ac4c9ff925795f3, 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: 1 +--- !u!222 &1353525442 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1272584967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 ---- !u!224 &1306163356 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224829893533863880, guid: a7048ab047ca87f4484bd8908232d163, - type: 3} - m_PrefabInstance: {fileID: 1800231175} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1314784216 + m_GameObject: {fileID: 1353525439} + m_CullTransparentMesh: 0 +--- !u!1 &1387320913 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2067,72 +2541,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1314784217} - - component: {fileID: 1314784219} - - component: {fileID: 1314784218} + - component: {fileID: 1387320914} + - component: {fileID: 1387320916} + - component: {fileID: 1387320915} m_Layer: 5 - m_Name: Background + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1314784217 +--- !u!224 &1387320914 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314784216} + m_GameObject: {fileID: 1387320913} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1809942183} + m_Father: {fileID: 1835771753} m_RootOrder: 0 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: 3.209999} - m_SizeDelta: {x: 0, y: 6.41} + 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: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1314784218 +--- !u!114 &1387320915 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314784216} + m_GameObject: {fileID: 1387320913} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 ---- !u!222 &1314784219 + m_FontData: + m_Font: {fileID: 12800000, guid: a8091ce330da38546be2451b8ef9254e, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '[Drop to use]' +--- !u!222 &1387320916 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314784216} + m_GameObject: {fileID: 1387320913} m_CullTransparentMesh: 0 --- !u!1 &1451355731 GameObject: @@ -3569,6 +4047,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833755421} m_CullTransparentMesh: 0 +--- !u!1 &1835771752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1835771753} + - component: {fileID: 1835771755} + - component: {fileID: 1835771754} + - component: {fileID: 1835771756} + m_Layer: 5 + m_Name: DropActions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1835771753 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835771752} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99975, y: 0.99975, z: 0.99975} + m_Children: + - {fileID: 1387320914} + m_Father: {fileID: 416435939485790107} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 124.71, y: 26.574997} + m_SizeDelta: {x: 219.07, y: 53.15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1835771754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835771752} + 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.4481132, g: 1, b: 0.6118143, a: 0.4627451} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!222 &1835771755 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835771752} + m_CullTransparentMesh: 0 +--- !u!114 &1835771756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835771752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82d61579ba4ff4342aa25d0dc6ea7715, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1964361736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1964361737} + - component: {fileID: 1964361739} + - component: {fileID: 1964361738} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1964361737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964361736} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 185488350} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0000038146973, y: 0.0000038146973} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1964361738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964361736} + 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.5438305, g: 0.990566, b: 0.52799034, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 2b55390650509fa42a65273640e176d1, 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!222 &1964361739 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964361736} + m_CullTransparentMesh: 0 --- !u!1 &1997407588 GameObject: m_ObjectHideFlags: 0 @@ -3716,8 +4358,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 204, y: -184} - m_SizeDelta: {x: 300, y: 50} + m_AnchoredPosition: {x: 262.7, y: -517.32996} + m_SizeDelta: {x: 300, y: 399.33} m_Pivot: {x: 0, y: 0} --- !u!114 &2057190882 MonoBehaviour: @@ -3996,15 +4638,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 416435939485790107} + - {fileID: 1353525440} - {fileID: 415998583785874695} + - {fileID: 564020840} - {fileID: 2026651267} m_Father: {fileID: 227365885} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000061035156, y: -131.00003} - m_SizeDelta: {x: 200, y: 400} + m_AnchoredPosition: {x: 2.5, y: -120} + m_SizeDelta: {x: 266.9, y: 400} m_Pivot: {x: 0, y: 1} --- !u!224 &415950275300511097 RectTransform: @@ -4038,12 +4682,12 @@ RectTransform: m_Children: - {fileID: 4721928838315897473} m_Father: {fileID: 415948494916139211} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -97.19997, y: -101.95999} - m_SizeDelta: {x: 194.4, y: -203.88} + m_AnchoredPosition: {x: -122.96, y: -95.97} + m_SizeDelta: {x: 248.97, y: -215.86} m_Pivot: {x: 0, y: 0.5} --- !u!224 &416002536143104123 RectTransform: @@ -4061,8 +4705,8 @@ RectTransform: 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: 3.22, y: 21.07} - m_SizeDelta: {x: 181.11, y: 80} + m_AnchoredPosition: {x: 0.25748, y: 16.963} + m_SizeDelta: {x: 219.06, y: 88.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &416435939485790107 RectTransform: @@ -4077,14 +4721,15 @@ RectTransform: m_Children: - {fileID: 415950275300511097} - {fileID: 416002536143104123} + - {fileID: 1835771753} - {fileID: 6130115230108673601} m_Father: {fileID: 415948494916139211} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 98.04999} - m_SizeDelta: {x: 200, y: -196.1} + m_AnchoredPosition: {x: 1.5, y: 94.56} + m_SizeDelta: {x: 248.91, y: -203.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &417778422584044713 CanvasRenderer: @@ -4184,6 +4829,8 @@ MonoBehaviour: PropInfoPopup: {fileID: 2026651271} UseButton: {fileID: 494489783201524395} ReadButton: {fileID: 3085203293368607607} + UsePropDropArea: {fileID: 1835771752} + DeequipPropDropArea: {fileID: 564020839} --- !u!114 &494389376244259081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4204,7 +4851,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, type: 3} + m_Sprite: {fileID: 21300000, guid: 51681de6ba29f8a4e936be3fda63b901, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4338,7 +4985,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.36936736, b: 0.4528302, a: 0.34901962} + m_Color: {r: 0.2028302, g: 0.85448486, b: 1, a: 0.6313726} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4712,8 +5359,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3931888545114695314} m_HandleRect: {fileID: 3071069527876206838} m_Direction: 2 - m_Value: 1 - m_Size: 0.65373325 + m_Value: 1.0000002 + m_Size: 0.6138 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4765,7 +5412,7 @@ PrefabInstance: - target: {fileID: 6680245457075671535, guid: 0a72ea45d960d454894b35f094304f5f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6680245457075671535, guid: 0a72ea45d960d454894b35f094304f5f, type: 3} @@ -5392,12 +6039,12 @@ RectTransform: - {fileID: 415497084381228553} - {fileID: 7228521898446873452} m_Father: {fileID: 416435939485790107} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 105.978195, y: 51.365} - m_SizeDelta: {x: 181.6, y: 59.41} + m_AnchoredPosition: {x: 124.71, y: 26.574997} + m_SizeDelta: {x: 219.06, y: 53.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &6174284039938326804 RectTransform: diff --git a/Zilon.Client/Assets/Zilon/Scenes/scores.unity b/Zilon.Client/Assets/Zilon/Scenes/scores.unity new file mode 100644 index 000000000..b45fe3aeb --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scenes/scores.unity @@ -0,0 +1,1928 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &19703730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 19703732} + - component: {fileID: 19703731} + m_Layer: 0 + m_Name: SceneContext + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &19703731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19703730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89715ad69b973a14899afa2c6730b30b, type: 3} + m_Name: + m_EditorClassIdentifier: + _scriptableObjectInstallers: [] + _monoInstallers: [] + _installerPrefabs: [] + _autoRun: 1 + OnPreInstall: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPostInstall: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPreResolve: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPostResolve: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + _parentNewObjectsUnderSceneContext: 0 + _contractNames: [] + _parentContractNames: [] +--- !u!4 &19703732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19703730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &339078775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 339078776} + - component: {fileID: 339078779} + - component: {fileID: 339078778} + - component: {fileID: 339078777} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &339078776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339078775} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 817298686} + m_Father: {fileID: 1553406898} + m_RootOrder: 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: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &339078777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339078775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &339078778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339078775} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10917, 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!222 &339078779 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339078775} + m_CullTransparentMesh: 0 +--- !u!1 &403504144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 403504145} + - component: {fileID: 403504147} + - component: {fileID: 403504146} + m_Layer: 5 + m_Name: MaxLifetimeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &403504145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403504144} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000601, y: 1.0000601, z: 1.0000601} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250.79999, y: -95.4991} + m_SizeDelta: {x: 278.6, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &403504146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403504144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Max Lifetime: 30 year' +--- !u!222 &403504147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403504144} + m_CullTransparentMesh: 0 +--- !u!1 &468171564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 468171565} + - component: {fileID: 468171567} + - component: {fileID: 468171566} + m_Layer: 5 + m_Name: MaxFragsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &468171565 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468171564} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000601, y: 1.0000601, z: 1.0000601} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250.79999, y: -65.4991} + m_SizeDelta: {x: 278.6, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &468171566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468171564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'MaxFrags: 140000' +--- !u!222 &468171567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468171564} + m_CullTransparentMesh: 0 +--- !u!1 &626079766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 626079767} + - component: {fileID: 626079769} + - component: {fileID: 626079768} + m_Layer: 5 + m_Name: MaxScoresText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &626079767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626079766} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000601, y: 1.0000601, z: 1.0000601} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250.79999, y: -35.498596} + m_SizeDelta: {x: 278.6, y: 29.998993} + m_Pivot: {x: 0, y: 1} +--- !u!114 &626079768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626079766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'MaxScores: 140000' +--- !u!222 &626079769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626079766} + m_CullTransparentMesh: 0 +--- !u!1 &770589098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 770589099} + - component: {fileID: 770589101} + - component: {fileID: 770589100} + m_Layer: 5 + m_Name: AvgFragsText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &770589099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770589098} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000601, y: 1.0000601, z: 1.0000601} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.0048828125, y: -65.4991} + m_SizeDelta: {x: 244.29999, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &770589100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770589098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'AvgFrags: 40000' +--- !u!222 &770589101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770589098} + m_CullTransparentMesh: 0 +--- !u!1 &817298685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817298686} + - component: {fileID: 817298687} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &817298686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817298685} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 339078776} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.000013709068} + m_SizeDelta: {x: 0, y: 570} + m_Pivot: {x: 0, y: 1} +--- !u!114 &817298687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817298685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &872339824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 872339827} + - component: {fileID: 872339826} + - component: {fileID: 872339825} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &872339825 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872339824} + m_Enabled: 1 +--- !u!20 &872339826 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872339824} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.5377358, g: 0.472193, b: 0.35257208, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &872339827 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872339824} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &908659519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 908659520} + - component: {fileID: 908659522} + - component: {fileID: 908659521} + m_Layer: 5 + m_Name: AvgScoresText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &908659520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908659519} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 1 + 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: -35.5} + m_SizeDelta: {x: 244.29999, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &908659521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908659519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'AvgScores: 40000' +--- !u!222 &908659522 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908659519} + m_CullTransparentMesh: 0 +--- !u!1 &1161581734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1161581738} + - component: {fileID: 1161581737} + - component: {fileID: 1161581736} + - component: {fileID: 1161581735} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1161581735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161581734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1161581736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161581734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1161581737 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161581734} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 872339826} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1161581738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161581734} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1197875546} + m_Father: {fileID: 0} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1197875545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1197875546} + - component: {fileID: 1197875548} + - component: {fileID: 1197875547} + - component: {fileID: 1197875549} + m_Layer: 5 + m_Name: ScoresHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1197875546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197875545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1553406898} + - {fileID: 1590840970} + - {fileID: 1524350558} + m_Father: {fileID: 1161581738} + m_RootOrder: 0 + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1197875547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197875545} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 51681de6ba29f8a4e936be3fda63b901, 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: 1 +--- !u!222 &1197875548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197875545} + m_CullTransparentMesh: 0 +--- !u!114 &1197875549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197875545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54127e6c9ae672049b8e7bc03bc7055a, type: 3} + m_Name: + m_EditorClassIdentifier: + ScoresTableRowPrefab: {fileID: 4681236523031120759, guid: 3faa1552151bc0c4abf3fe1d4fe6f19b, + type: 3} + ScoreRecordParent: {fileID: 817298686} +--- !u!1001 &1292008523 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5663191483520838982, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_Name + value: GlobeGameCursor + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5727240748444693956, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, type: 3} +--- !u!1 &1503868404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1503868405} + - component: {fileID: 1503868407} + - component: {fileID: 1503868406} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1503868405 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503868404} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1635402442} + m_RootOrder: 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1503868406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503868404} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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!222 &1503868407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503868404} + m_CullTransparentMesh: 0 +--- !u!1 &1524350557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1524350558} + - component: {fileID: 1524350561} + - component: {fileID: 1524350560} + - component: {fileID: 1524350559} + m_Layer: 5 + m_Name: MainMenuButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1524350558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524350557} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1588368903} + m_Father: {fileID: 1197875546} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15, y: 15} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 1, y: 0} +--- !u!114 &1524350559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524350557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1524350560} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1197875549} + m_MethodName: ToMainMenuButton_Handler + 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 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1524350560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524350557} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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: 1 +--- !u!222 &1524350561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524350557} + m_CullTransparentMesh: 0 +--- !u!1 &1553406897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1553406898} + - component: {fileID: 1553406901} + - component: {fileID: 1553406900} + - component: {fileID: 1553406899} + m_Layer: 5 + m_Name: Table Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1553406898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553406897} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 339078776} + - {fileID: 1618002722} + m_Father: {fileID: 1197875546} + m_RootOrder: 0 + 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: 117.5} + m_SizeDelta: {x: -30, y: -265} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1553406899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553406897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 817298686} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 339078776} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1618002723} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1553406900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553406897} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!222 &1553406901 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553406897} + m_CullTransparentMesh: 0 +--- !u!1 &1588368902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1588368903} + - component: {fileID: 1588368905} + - component: {fileID: 1588368904} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1588368903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588368902} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1524350558} + m_RootOrder: 0 + 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!114 &1588368904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588368902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: To Main Menu +--- !u!222 &1588368905 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588368902} + m_CullTransparentMesh: 0 +--- !u!1 &1590840969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1590840970} + - component: {fileID: 1590840971} + m_Layer: 5 + m_Name: Summary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1590840970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1590840969} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1946784960} + - {fileID: 908659520} + - {fileID: 626079767} + - {fileID: 770589099} + - {fileID: 468171565} + - {fileID: 1649149009} + - {fileID: 403504145} + m_Father: {fileID: 1197875546} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -15, y: 45} + m_SizeDelta: {x: -30, y: 205} + m_Pivot: {x: 1, y: 0} +--- !u!114 &1590840971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1590840969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa0b1ed2daecd4349a765d005c9c1d8b, type: 3} + m_Name: + m_EditorClassIdentifier: + AvgScoresText: {fileID: 908659521} + MaxScoresText: {fileID: 626079768} + AvgFragsText: {fileID: 770589100} + MaxFragsText: {fileID: 468171566} + AvgLifetimeText: {fileID: 1649149010} + MaxLifetimeText: {fileID: 403504146} +--- !u!1 &1618002721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1618002722} + - component: {fileID: 1618002725} + - component: {fileID: 1618002724} + - component: {fileID: 1618002723} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1618002722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618002721} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1635402442} + m_Father: {fileID: 1553406898} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1618002723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618002721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1503868406} + m_HandleRect: {fileID: 1503868405} + m_Direction: 2 + m_Value: 1 + m_Size: 0.5877193 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1618002724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618002721} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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!222 &1618002725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618002721} + m_CullTransparentMesh: 0 +--- !u!1 &1635402441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1635402442} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1635402442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635402441} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1503868405} + m_Father: {fileID: 1618002722} + m_RootOrder: 0 + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1649149008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649149009} + - component: {fileID: 1649149011} + - component: {fileID: 1649149010} + m_Layer: 5 + m_Name: AvgLifetimeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1649149009 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649149008} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000601, y: 1.0000601, z: 1.0000601} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.0048828125, y: -95.4991} + m_SizeDelta: {x: 244.29999, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1649149010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649149008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'AvgLifetime: 1 year' +--- !u!222 &1649149011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649149008} + m_CullTransparentMesh: 0 +--- !u!1 &1712421921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1712421924} + - component: {fileID: 1712421923} + - component: {fileID: 1712421922} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1712421922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712421921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1712421923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712421921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1712421924 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712421921} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1946784959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1946784960} + - component: {fileID: 1946784962} + - component: {fileID: 1946784961} + m_Layer: 5 + m_Name: SummaryHeaderText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1946784960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946784959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1590840970} + m_RootOrder: 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: 160, y: 36} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1946784961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946784959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.91764706, g: 0.7529412, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: a8091ce330da38546be2451b8ef9254e, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Summary +--- !u!222 &1946784962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946784959} + m_CullTransparentMesh: 0 diff --git a/Zilon.Client/Assets/Zilon/Scenes/scores.unity.meta b/Zilon.Client/Assets/Zilon/Scenes/scores.unity.meta new file mode 100644 index 000000000..c26440de5 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scenes/scores.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 721f50cc8827c684bac660610525f7a9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scenes/title.unity b/Zilon.Client/Assets/Zilon/Scenes/title.unity index a90eeff47..32ebd6fb5 100644 --- a/Zilon.Client/Assets/Zilon/Scenes/title.unity +++ b/Zilon.Client/Assets/Zilon/Scenes/title.unity @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,7 +94,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -181,6 +189,271 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2dc2f30e7a4a36746a9a59c05d8cac82, type: 3} +--- !u!1001 &115725253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 293031208} + m_Modifications: + - target: {fileID: 2635179049708252236, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Name + value: VkWebUrlButton + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 292.46 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3656590226447628629, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 60930e5a76f75cd418e60c0b02488917, + type: 3} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849174, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Text + value: VK Group + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252238, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1942891070} + - target: {fileID: 2635179049708252238, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OpenVkUrlHandler + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: da80eb938175d4b418729bbf0135842f, type: 3} +--- !u!224 &115725254 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + m_PrefabInstance: {fileID: 115725253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &293031207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 293031208} + - component: {fileID: 293031209} + m_Layer: 5 + m_Name: Web Links + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &293031208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293031207} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 606493910} + - {fileID: 115725254} + - {fileID: 1866952201} + m_Father: {fileID: 1942891069} + m_RootOrder: 3 + 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: 350.42, y: 123.65} + m_Pivot: {x: 0, y: 1} +--- !u!114 &293031209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293031207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &465360644 GameObject: m_ObjectHideFlags: 0 @@ -227,7 +500,7 @@ MonoBehaviour: m_GameObject: {fileID: 465360644} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -247,6 +520,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &465360647 CanvasRenderer: m_ObjectHideFlags: 0 @@ -293,9 +567,10 @@ Camera: m_ClearFlags: 1 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -338,6 +613,222 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &606493909 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 293031208} + m_Modifications: + - target: {fileID: 2635179049708252236, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Name + value: BlogWebUrlButton + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 292.46 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalScale.x + value: 1.0000601 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalScale.y + value: 1.0000601 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalScale.z + value: 1.0000601 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3656590226447628629, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c6f5f64361898cf498103428c637b362, + type: 3} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849174, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Text + value: Web Site + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252238, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1942891070} + - target: {fileID: 2635179049708252238, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OpenBlogUrlHandler + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: da80eb938175d4b418729bbf0135842f, type: 3} +--- !u!224 &606493910 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + m_PrefabInstance: {fileID: 606493909} + m_PrefabAsset: {fileID: 0} --- !u!1 &679293963 GameObject: m_ObjectHideFlags: 0 @@ -384,7 +875,7 @@ MonoBehaviour: m_GameObject: {fileID: 679293963} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -463,7 +954,7 @@ MonoBehaviour: m_GameObject: {fileID: 764577200} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -542,7 +1033,7 @@ MonoBehaviour: m_GameObject: {fileID: 864477431} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -562,6 +1053,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &864477434 CanvasRenderer: m_ObjectHideFlags: 0 @@ -616,7 +1108,7 @@ MonoBehaviour: m_GameObject: {fileID: 996804355} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -636,6 +1128,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &996804358 CanvasRenderer: m_ObjectHideFlags: 0 @@ -692,7 +1185,7 @@ MonoBehaviour: m_GameObject: {fileID: 1032730791} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -706,6 +1199,8 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &1095284984 GameObject: m_ObjectHideFlags: 0 @@ -754,7 +1249,7 @@ MonoBehaviour: m_GameObject: {fileID: 1095284984} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -768,17 +1263,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1095284987} @@ -807,7 +1305,7 @@ MonoBehaviour: m_GameObject: {fileID: 1095284984} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -827,6 +1325,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1095284988 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1008,7 +1507,7 @@ MonoBehaviour: m_GameObject: {fileID: 1307354498} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1028,6 +1527,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1307354501 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1063,7 +1563,7 @@ MonoBehaviour: m_GameObject: {fileID: 1321956528} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -1082,7 +1582,7 @@ MonoBehaviour: m_GameObject: {fileID: 1321956528} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -1102,85 +1602,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1432629712 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1432629713} - - component: {fileID: 1432629715} - - component: {fileID: 1432629714} - m_Layer: 5 - m_Name: RepoUrlText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1432629713 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432629712} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1866952201} - m_RootOrder: 0 - 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, y: 1} ---- !u!114 &1432629714 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432629712} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: https://github.com/kreghek/Zilon_Roguelike ---- !u!222 &1432629715 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432629712} - m_CullTransparentMesh: 0 --- !u!1 &1439788879 GameObject: m_ObjectHideFlags: 0 @@ -1282,7 +1703,7 @@ MonoBehaviour: m_GameObject: {fileID: 1522774626} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1296,17 +1717,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1522774629} @@ -1335,7 +1759,7 @@ MonoBehaviour: m_GameObject: {fileID: 1522774626} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1355,6 +1779,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1522774630 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1426,88 +1851,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1560570740} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1601658810 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1601658811} - - component: {fileID: 1601658813} - - component: {fileID: 1601658812} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1601658811 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1601658810} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1660463532} - m_Father: {fileID: 1866952201} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1601658812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1601658810} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bc9f1b9da86a5e84196644ff5bfdc2a6, 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 ---- !u!222 &1601658813 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1601658810} - m_CullTransparentMesh: 0 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1627452247 GameObject: m_ObjectHideFlags: 0 @@ -1545,85 +1895,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 170.20001, y: 60} m_Pivot: {x: 1, y: 1} ---- !u!1 &1660463531 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1660463532} - - component: {fileID: 1660463534} - - component: {fileID: 1660463533} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1660463532 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660463531} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1601658811} - m_RootOrder: 0 - 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!114 &1660463533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660463531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: => ---- !u!222 &1660463534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660463531} - m_CullTransparentMesh: 0 --- !u!1 &1733036126 GameObject: m_ObjectHideFlags: 0 @@ -1670,7 +1941,7 @@ MonoBehaviour: m_GameObject: {fileID: 1733036126} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1703,97 +1974,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733036126} m_CullTransparentMesh: 0 ---- !u!1 &1866952200 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1866952201} - - component: {fileID: 1866952202} - m_Layer: 5 - m_Name: RepoUrlButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1866952201 +--- !u!224 &1866952201 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1866952200} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1432629713} - - {fileID: 1601658811} - m_Father: {fileID: 1942891069} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -5} - m_SizeDelta: {x: 292.46, y: 18.24} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1866952202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + m_PrefabInstance: {fileID: 2635179049117155908} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1866952200} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1942891070} - m_MethodName: OpenRepoUrlHandler - 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 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &1877844420 GameObject: m_ObjectHideFlags: 0 @@ -1841,7 +2027,7 @@ MonoBehaviour: m_GameObject: {fileID: 1877844420} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1861,6 +2047,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1877844423 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1878,7 +2065,7 @@ MonoBehaviour: m_GameObject: {fileID: 1877844420} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 1, g: 1, b: 1, a: 1} @@ -1913,7 +2100,7 @@ MonoBehaviour: m_GameObject: {fileID: 1942891065} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -1930,7 +2117,7 @@ MonoBehaviour: m_GameObject: {fileID: 1942891065} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -1978,7 +2165,7 @@ RectTransform: - {fileID: 996804356} - {fileID: 1877844421} - {fileID: 1032730792} - - {fileID: 1866952201} + - {fileID: 293031208} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2097,7 +2284,7 @@ MonoBehaviour: m_GameObject: {fileID: 2141624856} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2111,17 +2298,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 2141624859} @@ -2150,7 +2340,7 @@ MonoBehaviour: m_GameObject: {fileID: 2141624856} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2170,6 +2360,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &2141624860 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2178,3 +2369,182 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2141624856} m_CullTransparentMesh: 0 +--- !u!1001 &2635179049117155908 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 293031208} + m_Modifications: + - target: {fileID: 2635179049708252236, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Name + value: GithubWebUrlButton + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 292.46 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252237, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608862942731024723, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179050410849173, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2635179049708252238, guid: da80eb938175d4b418729bbf0135842f, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1942891070} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: da80eb938175d4b418729bbf0135842f, type: 3} diff --git a/Zilon.Client/Assets/Zilon/Scripts/GlobalInstaller.cs b/Zilon.Client/Assets/Zilon/Scripts/GlobalInstaller.cs index 8c3bb43f1..6b188f476 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/GlobalInstaller.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/GlobalInstaller.cs @@ -32,6 +32,7 @@ public override void InstallBindings() Container.Bind().To().AsSingle(); Container.Bind().To().AsSingle(); Container.Bind().AsSingle(); + Container.Bind().AsSingle(); Container.Bind().AsSingle(); diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs new file mode 100644 index 000000000..1fb58d357 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs @@ -0,0 +1,95 @@ +using Assets.Zilon.Scripts.Services; + +using UnityEngine; +using UnityEngine.EventSystems; + +using Zenject; + +using Zilon.Core.Client; +using Zilon.Core.Commands; + +public class DoubleClickPropHandler : MonoBehaviour, IPointerDownHandler +{ + float lastClick = 0f; + float interval = 0.4f; + + private const string HISTORY_BOOK_SID = "history-book"; + + [Inject] private readonly ISectorUiState _playerState; + [Inject] private readonly ICommandManager _commandManager; + [Inject] private readonly IInventoryState _inventoryState; + [Inject] private readonly SpecialCommandManager _specialCommandManager; + + [Inject(Id = "use-self-command")] private readonly ICommand _useSelfCommand; + [Inject(Id = "show-history-command")] private readonly ICommand _showHistoryCommand; + + public PropItemVm PropItemViewModel; + + public void OnPointerDown(PointerEventData eventData) + { + if ((lastClick + interval) > Time.time) + { + _inventoryState.SelectedProp = PropItemViewModel; + + var prop = PropItemViewModel.Prop; + + if (!(prop.Scheme.Sid == HISTORY_BOOK_SID)) + { + var canUseProp = prop.Scheme.Use != null; + if (canUseProp) + { + UseProp(); + } + else if (prop.Scheme.Equip != null) + { + EquipProp(PropItemViewModel); + } + } + else + { + ReadProp(); + } + } + + lastClick = Time.time; + } + + /// + /// Метод выбирает слот по типу предмета. Выбор слота выполняется на основе команды на экипировку. + /// 1. Перебираем все слоты персонажа. + /// 2. Если экипировка возможна в текущий слот, то 3. + /// 3. Выполняем команду на экипировку в текущий слот. + /// + private void EquipProp(IPropItemViewModel propItemViewModel) + { + _inventoryState.SelectedProp = propItemViewModel; + + var actor = _playerState.ActiveActor.Actor; + var person = actor.Person; + var personSlots = person.EquipmentCarrier.Slots; + + for (var slotIndex = 0; slotIndex < personSlots.Length; slotIndex++) + { + var equipCommand = _specialCommandManager.GetEquipCommand(slotIndex); + if (equipCommand.CanExecute()) + { + _commandManager.Push(equipCommand); + + break; + } + } + } + + private void UseProp() + { + _commandManager.Push(_useSelfCommand); + } + + private void ReadProp() + { + if (_inventoryState.SelectedProp.Prop.Scheme.Sid == HISTORY_BOOK_SID) + { + _commandManager.Push(_showHistoryCommand); + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs.meta new file mode 100644 index 000000000..f512b6a47 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DoubleClickPropHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 01e402c6f908ae44c9e31ad4f428e155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs new file mode 100644 index 000000000..0411f89d6 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs @@ -0,0 +1,99 @@ +using System; + +using UnityEngine; +using UnityEngine.UI; + +using Zilon.Core.Props; + +public class DraggedPropItem : MonoBehaviour +{ + public Text CountText; + public Text DurableStatusText; + public Image IconImage; + public Image SelectedBorder; + + public string Sid; + + public IProp Prop { get; private set; } + + public Vector3 Position => GetComponent().position; + + public event EventHandler Click; + public event EventHandler MouseEnter; + public event EventHandler MouseExit; + + public void Init(PropItemVm propItemViewModel) + { + Prop = propItemViewModel?.Prop; + + UpdateProp(); + } + + public void Init(InventorySlotVm inventorySlotViewModel) + { + Prop = inventorySlotViewModel?.Prop; + + UpdateProp(); + } + + public void SetSelectedState(bool value) + { + SelectedBorder.gameObject.SetActive(value); + } + + public void Click_Handler() + { + Click?.Invoke(this, new EventArgs()); + } + + public void OnMouseEnter() + { + MouseEnter?.Invoke(this, new EventArgs()); + } + + public void OnMouseExit() + { + MouseExit?.Invoke(this, new EventArgs()); + } + + public void UpdateProp() + { + if (Prop is Resource resource) + { + CountText.gameObject.SetActive(true); + CountText.text = $"x{resource.Count}"; + + DurableStatusText.gameObject.SetActive(false); + } + else if (Prop is Equipment equipment) + { + CountText.gameObject.SetActive(false); + + if (equipment.Durable.Value <= 0) + { + DurableStatusText.gameObject.SetActive(true); + DurableStatusText.text = "B"; + } + else + { + DurableStatusText.gameObject.SetActive(false); + } + } + else + { + throw new ArgumentException($"Тип предмета {Prop.GetType().Name} не поддерживается", nameof(Prop)); + } + + Sid = Prop.Scheme.Sid; + + var iconSprite = CalcIcon(Prop); + + IconImage.sprite = iconSprite; + } + + private Sprite CalcIcon(IProp prop) + { + var iconSprite = Resources.Load($"Icons/props/{prop.Scheme.Sid}"); + return iconSprite; + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs.meta new file mode 100644 index 000000000..b2fb1b996 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/DraggedPropItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 01b8078c9b2be094785bb1db7269d26b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs new file mode 100644 index 000000000..839e84eb0 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs @@ -0,0 +1,33 @@ +using Assets.Zilon.Scripts.Services; + +using UnityEngine.EventSystems; + +using Zenject; + +using Zilon.Core.Client; +using Zilon.Core.Commands; + +/// +/// Обработчик сброса экипировки из слота в инвентарь. +/// +public class InventoryDropHandler : UIBehaviour, IDropHandler +{ + [Inject] private readonly SpecialCommandManager _specialCommandManager; + [Inject] private readonly IInventoryState _inventoryState; + [Inject] private readonly ICommandManager _commandManager; + + public void OnDrop(PointerEventData eventData) + { + var droppedInventorySlot = eventData.pointerDrag?.GetComponent(); + if (droppedInventorySlot != null) + { + var equipCommand = _specialCommandManager.GetEquipCommand(droppedInventorySlot.SlotIndex); + + _inventoryState.SelectedProp = null; + + _commandManager.Push(equipCommand); + + return; + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs.meta new file mode 100644 index 000000000..5391a9497 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventoryDropHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6fa52e38b72816544bee9991d66e0d26 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs new file mode 100644 index 000000000..b4552ee0b --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs @@ -0,0 +1,61 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using Zenject; + +//TODO Объединить *DragHandler +// PropDragHandler и InventorySlotDragHandler. +// У них много общего. И достаточно сложная логика. +public class InventorySlotDragHandler : UIBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler +{ + [Inject] + private DiContainer _diContainer; + + public DraggedPropItem DraggedPropItemPrefab; + public InventorySlotVm InventorySlotViewModel; + + private DraggedPropItem _draggedPropItem; + + public void OnBeginDrag(PointerEventData eventData) + { + // Этот блок на свякий случай. + // Прецедентов не было, но удаление может сломаться. + if (_draggedPropItem != null) + { + Debug.LogError("Была ошибка при удалении."); + Destroy(_draggedPropItem.gameObject); + } + + var parentCanvas = FindObjectOfType(); + + var draggedPropItemObj = _diContainer.InstantiatePrefab(DraggedPropItemPrefab, parentCanvas.transform); + + _draggedPropItem = draggedPropItemObj.GetComponent(); + _draggedPropItem.Init(InventorySlotViewModel); + + InventorySlotViewModel.SetDraggingState(true); + } + + public void OnDrag(PointerEventData eventData) + { + if (_draggedPropItem != null) + { + // Это преобразование нужно для того, чтобы объект перетаскиваемого предмета корректно отрисовывался под курсором. + // Если сделать просто _draggedPropItem.transform.position = Input.mousePosition, как это показывают в мануалах, + // то объект вообще будет иметь координаты, далёкие от канваса. + var parentRect = (RectTransform)_draggedPropItem.transform.parent; + RectTransformUtility.ScreenPointToLocalPointInRectangle(parentRect, eventData.position, Camera.main, out var posInParent); + + _draggedPropItem.transform.localPosition = posInParent; + } + } + + public void OnEndDrag(PointerEventData eventData) + { + if (_draggedPropItem != null) + { + Destroy(_draggedPropItem.gameObject); + } + + InventorySlotViewModel.SetDraggingState(false); + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs.meta new file mode 100644 index 000000000..b3d5d0c7d --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDragHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8729f2ceb489e1d41a95667219e8a1d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs new file mode 100644 index 000000000..8555a0459 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs @@ -0,0 +1,49 @@ +using Assets.Zilon.Scripts.Services; +using UnityEngine; +using UnityEngine.EventSystems; + +using Zenject; + +using Zilon.Core.Client; +using Zilon.Core.Commands; +using Zilon.Core.Props; + +public class InventorySlotDropHandler : UIBehaviour, IDropHandler +{ + [Inject] private readonly SpecialCommandManager _specialCommandManager; + [Inject] private readonly ICommandManager _commandManager; + [Inject] private readonly IInventoryState _inventoryState; + + public InventorySlotVm InventorySlotViewModel; + + public void OnDrop(PointerEventData eventData) + { + var slotIndex = InventorySlotViewModel.SlotIndex; + + var equipCommand = _specialCommandManager.GetEquipCommand(slotIndex); + + if (equipCommand.CanExecute()) + { + var droppedPropItem = eventData.pointerDrag?.GetComponent(); + if (droppedPropItem != null) + { + // Значит экипировка произошла из инвентаря. + _inventoryState.SelectedProp = droppedPropItem; + + _commandManager.Push(equipCommand); + + return; + } + + var droppedInventorySlot = eventData.pointerDrag?.GetComponent(); + if (droppedInventorySlot != null) + { + _inventoryState.SelectedProp = droppedInventorySlot; + + _commandManager.Push(equipCommand); + + return; + } + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs.meta new file mode 100644 index 000000000..762967c70 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotDropHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4bd9b8fd20663df4c95d29effdfde25e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotVm.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotVm.cs index e127f4305..da75548e8 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotVm.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/InventorySlotVm.cs @@ -1,6 +1,8 @@ using System; using Assets.Zilon.Scripts.Models; +using Assets.Zilon.Scripts.Models.Modals; +using Assets.Zilon.Scripts.Services; using JetBrains.Annotations; @@ -16,11 +18,13 @@ using Zilon.Core.Props; using Zilon.Core.Tactics; -public class InventorySlotVm : MonoBehaviour, IPropViewModelDescription +public class InventorySlotVm : MonoBehaviour, IPropItemViewModel, IPropViewModelDescription { - [NotNull] [Inject] private readonly ICommandManager _comamndManager; - [NotNull] [Inject] private readonly IInventoryState _inventoryState; - [NotNull] [Inject(Id = "equip-command")] private readonly ICommand _equipCommand; + [Inject] private readonly ICommandManager _comamndManager; + [Inject] private readonly IInventoryState _inventoryState; + [Inject] private readonly SpecialCommandManager _specialCommandManager; + + [NotNull] private ICommand _equipCommand; public IActor Actor { get; set; } public int SlotIndex; @@ -43,10 +47,14 @@ public IProp Prop public event EventHandler Click; public event EventHandler MouseEnter; public event EventHandler MouseExit; + public event EventHandler DraggingStateChanged; + + public bool SelectAsDrag; + public void Start() { - ((EquipCommand)_equipCommand).SlotIndex = SlotIndex; + _equipCommand = _specialCommandManager.GetEquipCommand(SlotIndex); UpdateSlotIcon(); InitEventHandlers(); @@ -140,4 +148,20 @@ private void ClearEventHandlers() { Actor.Person.EquipmentCarrier.EquipmentChanged -= EquipmentCarrierOnEquipmentChanged; } + + public void SetDraggingState(bool value) + { + SelectAsDrag = value; + + if (value) + { + IconImage.color = new Color(1, 1, 1, 0.5f); + } + else + { + IconImage.color = new Color(1, 1, 1, 1f); + } + + DraggingStateChanged?.Invoke(this, new PropDraggingStateEventArgs(value)); + } } \ No newline at end of file diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PerkItemViewModel.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PerkItemViewModel.cs index c44441555..63c800066 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PerkItemViewModel.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PerkItemViewModel.cs @@ -14,11 +14,12 @@ /// /// Сейчас используется только в окне персонажа. /// -public sealed class PerkItemViewModel : MonoBehaviour, IPerkViewModel, IPerkViewModelDescription { +public sealed class PerkItemViewModel : MonoBehaviour, IPerkViewModel, IPerkViewModelDescription +{ - public Text LevelText; - public Image IconImage; - public Image SelectedBorder; + public Text LevelText; + public Image IconImage; + public Image SelectedBorder; public Vector3 Position => GetComponent().position; public IPerk Perk { get; private set; } @@ -28,23 +29,23 @@ public sealed class PerkItemViewModel : MonoBehaviour, IPerkViewModel, IPerkView public event EventHandler MouseExit; public void Init(IPerk perk) - { + { Perk = perk; - var iconSprite = CalcIcon(perk); + var iconSprite = CalcIcon(perk); - IconImage.sprite = iconSprite; + IconImage.sprite = iconSprite; - if (perk.CurrentLevel != null) - { - LevelText.gameObject.SetActive(true); - LevelText.text = $"{perk.CurrentLevel.Primary + 1} +{perk.CurrentLevel.Sub + 1}"; - } - else - { - LevelText.gameObject.SetActive(false); - } - } + if (perk.CurrentLevel != null) + { + LevelText.gameObject.SetActive(true); + LevelText.text = $"{perk.CurrentLevel.Primary + 1} +{perk.CurrentLevel.Sub + 1}"; + } + else + { + LevelText.gameObject.SetActive(false); + } + } public void Click_Handler() { @@ -62,8 +63,8 @@ public void OnMouseExit() } private Sprite CalcIcon(IPerk perk) - { - var iconSprite = Resources.Load($"Icons/perks/{perk.Scheme.Sid}"); - return iconSprite; - } + { + var iconSprite = Resources.Load($"Icons/perks/{perk.Scheme.Sid}"); + return iconSprite; + } } diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs new file mode 100644 index 000000000..83108fbc3 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs @@ -0,0 +1,76 @@ +using JetBrains.Annotations; + +using UnityEngine; +using UnityEngine.EventSystems; + +using Zenject; +using Zilon.Core.Client; + +public class PropDragHandler : UIBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler +{ + private const string HISTORY_BOOK_SID = "history-book"; + + private DraggedPropItem _draggedPropItem; + + public PropItemVm PropItemViewModel; + public DraggedPropItem DraggedPropItemPrefab; + + [Inject] private readonly DiContainer _diContainer; + [Inject] private readonly IInventoryState _inventoryState; + + public void OnBeginDrag(PointerEventData eventData) + { + // Этот блок на свякий случай. + // Прецедентов не было, но удаление может сломаться. + if (_draggedPropItem != null) + { + Debug.LogError("Была ошибка при удалении."); + Destroy(_draggedPropItem.gameObject); + } + + var propScheme = PropItemViewModel.Prop.Scheme; + var canUse = propScheme.Use != null; + var canRead = propScheme.Sid == HISTORY_BOOK_SID; + var canEquip = propScheme.Equip != null; + + var canDnd = canUse || canRead || canEquip; + if (!canDnd) + { + return; + } + + var parentCanvas = FindObjectOfType(); + + var draggedPropItemObj = _diContainer.InstantiatePrefab(DraggedPropItemPrefab, parentCanvas.transform); + + _draggedPropItem = draggedPropItemObj.GetComponent(); + _draggedPropItem.Init(PropItemViewModel); + + PropItemViewModel.SetDraggingState(true); + _inventoryState.SelectedProp = PropItemViewModel; + } + + public void OnEndDrag(PointerEventData eventData) + { + if (_draggedPropItem != null) + { + Destroy(_draggedPropItem.gameObject); + } + + PropItemViewModel.SetDraggingState(false); + } + + public void OnDrag(PointerEventData eventData) + { + if (_draggedPropItem != null) + { + // Это преобразование нужно для того, чтобы объект перетаскиваемого предмета корректно отрисовывался под курсором. + // Если сделать просто _draggedPropItem.transform.position = Input.mousePosition, как это показывают в мануалах, + // то объект вообще будет иметь координаты, далёкие от канваса. + var parentRect = (RectTransform)_draggedPropItem.transform.parent; + RectTransformUtility.ScreenPointToLocalPointInRectangle(parentRect, eventData.position, Camera.main, out var posInParent); + + _draggedPropItem.transform.localPosition = posInParent; + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs.meta new file mode 100644 index 000000000..60c103945 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDragHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c51c36dc9849767498db36a1634534f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs new file mode 100644 index 000000000..e1dc26ced --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs @@ -0,0 +1,14 @@ +using System; + +namespace Assets.Zilon.Scripts.Models.Modals +{ + public sealed class PropDraggingStateEventArgs: EventArgs + { + public PropDraggingStateEventArgs(bool dragging) + { + Dragging = dragging; + } + + public bool Dragging { get; } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs.meta new file mode 100644 index 000000000..d2c9e10cf --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDraggingStateEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5b8cd98b8d7210340b9cccc59f244335 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs new file mode 100644 index 000000000..50c5c60d6 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs @@ -0,0 +1,53 @@ +using JetBrains.Annotations; + +using UnityEngine; +using UnityEngine.EventSystems; + +using Zenject; + +using Zilon.Core.Client; +using Zilon.Core.Commands; + +public class PropDropHandler : MonoBehaviour, IDropHandler +{ + private const string HISTORY_BOOK_SID = "history-book"; + + [NotNull] [Inject] private readonly ICommandManager _commandManager; + [NotNull] [Inject] private readonly IInventoryState _inventoryState; + [NotNull] [Inject(Id = "use-self-command")] private readonly ICommand _useSelfCommand; + [NotNull] [Inject(Id = "show-history-command")] private readonly ICommand _showHistoryCommand; + + public void OnDrop(PointerEventData eventData) + { + var droppedPropItem = eventData.pointerDrag?.GetComponent(); + _inventoryState.SelectedProp = droppedPropItem; + + var prop = droppedPropItem?.Prop; + + if (!(prop.Scheme.Sid == HISTORY_BOOK_SID)) + { + var canUseProp = prop.Scheme.Use != null; + if (canUseProp) + { + UseProp(); + } + } + else + { + ReadProp(); + } + } + + private void UseProp() + { + _commandManager.Push(_useSelfCommand); + } + + private void ReadProp() + { + if (_inventoryState.SelectedProp.Prop.Scheme.Sid == HISTORY_BOOK_SID) + { + _commandManager.Push(_showHistoryCommand); + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs.meta new file mode 100644 index 000000000..4ba7ef410 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropDropHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 82d61579ba4ff4342aa25d0dc6ea7715 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropItemVm.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropItemVm.cs index 95219bcfa..37d9c4a09 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropItemVm.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/PropItemVm.cs @@ -1,6 +1,7 @@ using System; using Assets.Zilon.Scripts.Models; +using Assets.Zilon.Scripts.Models.Modals; using UnityEngine; using UnityEngine.UI; @@ -23,6 +24,9 @@ public sealed class PropItemVm : MonoBehaviour, IPropItemViewModel, IPropViewMod public event EventHandler Click; public event EventHandler MouseEnter; public event EventHandler MouseExit; + public event EventHandler DraggingStateChanged; + + public bool SelectAsDrag; public void Init(IProp prop) { @@ -36,6 +40,22 @@ public void SetSelectedState(bool value) SelectedBorder.gameObject.SetActive(value); } + public void SetDraggingState(bool value) + { + SelectAsDrag = value; + + if (value) + { + IconImage.color = new Color(1, 1, 1, 0.5f); + } + else + { + IconImage.color = new Color(1, 1, 1, 1f); + } + + DraggingStateChanged?.Invoke(this, new PropDraggingStateEventArgs(value)); + } + public void Click_Handler() { Click?.Invoke(this, new EventArgs()); diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/ScoreModalBody.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/ScoreModalBody.cs index 34cdf7572..8bc417c55 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/ScoreModalBody.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Modals/ScoreModalBody.cs @@ -68,11 +68,11 @@ public void Init() public void ApplyChanges() { - SceneManager.LoadScene("title"); + SceneManager.LoadScene("scores"); } public void CancelChanges() { - SceneManager.LoadScene("title"); + throw new NotSupportedException(); } } diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores.meta new file mode 100644 index 000000000..287dc5ed8 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90633aab8787abc44928ed31b4d936d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs new file mode 100644 index 000000000..f6027bde2 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs @@ -0,0 +1,58 @@ +using System; + +using Assets.Zilon.Scripts.Services; + +using UnityEngine; +using UnityEngine.UI; + +using Zenject; + +public class AggragateScoresHandler : MonoBehaviour +{ + public Text AvgScoresText; + public Text MaxScoresText; + public Text AvgFragsText; + public Text MaxFragsText; + public Text AvgLifetimeText; + public Text MaxLifetimeText; + + [Inject] + private readonly ScoreStorage _scoreStorage; + + public void Awake() + { + AggregateScores aggregareResults; + + try + { + aggregareResults = _scoreStorage.ReadAggregateScores(); + } + catch (Exception exception) + { + aggregareResults = new AggregateScores(); + Debug.LogError("Не удалось выполнить чтение результатов из БД\n" + exception.ToString()); + } + + AvgScoresText.text = $"Avg Scores: {aggregareResults.AvgScores:F2}"; + MaxScoresText.text = $"Max Scores: {aggregareResults.MaxScores:F2}"; + + AvgFragsText.text = $"Avg Frags: {aggregareResults.AvgFrags:F2}"; + MaxFragsText.text = $"Max Frags: {aggregareResults.MaxFrags:F2}"; + + var avgLifetime = GetLifetime((int)aggregareResults.AvgTurns); + AvgLifetimeText.text = $"Avg Lifetime: {avgLifetime}"; + var maxLifetime = GetLifetime((int)aggregareResults.MaxTurns); + MaxLifetimeText.text = $"Max Lifetime: {maxLifetime}"; + } + + private string GetLifetime(int turns) + { + var minutesTotal = turns * 2; + var hoursTotal = minutesTotal / 60f; + var daysTotal = hoursTotal / 24f; + var days = (int)daysTotal; + var hours = (int)(hoursTotal - days * 24); + + return $"{days} days {hours} hours" + "\n"; + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs.meta new file mode 100644 index 000000000..145748b63 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/AggragateScoresHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aa0b1ed2daecd4349a765d005c9c1d8b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs new file mode 100644 index 000000000..ff64fba56 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs @@ -0,0 +1,47 @@ +using System; + +using Assets.Zilon.Scripts.Services; + +using UnityEngine; +using UnityEngine.SceneManagement; + +using Zenject; + +public class ScoresHandler : MonoBehaviour +{ + public ScoresTableRow ScoresTableRowPrefab; + public Transform ScoreRecordParent; + + [Inject] + private readonly ScoreStorage _scoreStorage; + + public void Awake() + { + ScoresRecord[] scoreRecords; + + try + { + scoreRecords = _scoreStorage.ReadScores(); + } + catch (Exception exception) + { + scoreRecords = new ScoresRecord[0]; + Debug.LogError("Не удалось выполнить чтение результатов из БД\n" + exception.ToString()); + } + + var parentRect = ScoreRecordParent.GetComponent(); + var rowCount = scoreRecords.Length; + parentRect.sizeDelta = new Vector2(parentRect.sizeDelta.x, (60 + 5) * rowCount); + + foreach (var record in scoreRecords) + { + var row = Instantiate(ScoresTableRowPrefab, ScoreRecordParent); + row.Init(record.Number, record.Name, record.Scores, "[not impl]", "[not impl]"); + } + } + + public void ToMainMenuButton_Handler() + { + SceneManager.LoadScene("title"); + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs.meta new file mode 100644 index 000000000..8f0f17786 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 54127e6c9ae672049b8e7bc03bc7055a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs new file mode 100644 index 000000000..72a7744c4 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs @@ -0,0 +1,28 @@ +using System; + +using UnityEngine; +using UnityEngine.UI; + +public class ScoresTableRow : MonoBehaviour +{ + public Text NumberText; + + public Text NameText; + + public Text ScoresText; + + public Text DeathReasonText; + + public Text ArcheventsText; + + public void Init(int number, string name, int scores, string deathReason, string archievents) + { + archievents = "nothing"; + + NumberText.text = $"#{number}"; + NameText.text = name; + ScoresText.text = $"Scores: {scores}"; + DeathReasonText.text = $"Death Reason:{Environment.NewLine}{deathReason}"; + ArcheventsText.text = archievents; + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs.meta new file mode 100644 index 000000000..b8c2e325a --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/Scores/ScoresTableRow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 85e65c1f43304374a924ce1d4dee160b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/EffectViewModel.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/EffectViewModel.cs index 50a277d4a..09bef076b 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/EffectViewModel.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/EffectViewModel.cs @@ -13,6 +13,7 @@ public class EffectViewModel : MonoBehaviour public Sprite HungerSprite; public Sprite ThristSprite; + public Sprite IntoxicationSprite; public SurvivalStatType Type { get; private set; } public SurvivalStatHazardLevel Level { get; private set; } @@ -39,9 +40,13 @@ private void ShowText() effectText += " Hunger"; break; - case SurvivalStatType.Water: + case SurvivalStatType.Hydration: effectText += " Thrist"; break; + + case SurvivalStatType.Intoxication: + effectText += " Intoxication"; + break; } NameText.color = Color.gray; @@ -54,9 +59,13 @@ private void ShowText() effectText = "Hunger"; break; - case SurvivalStatType.Water: + case SurvivalStatType.Hydration: effectText = "Thrist"; break; + + case SurvivalStatType.Intoxication: + effectText += "Intoxication"; + break; } NameText.color = Color.red; @@ -69,9 +78,13 @@ private void ShowText() effectText = "Starvation!"; break; - case SurvivalStatType.Water: + case SurvivalStatType.Hydration: effectText = "Dehydration!"; break; + + case SurvivalStatType.Intoxication: + effectText += "Strong Intoxication!"; + break; } NameText.color = Color.red; break; @@ -109,10 +122,14 @@ private void SelectIcon(SurvivalStatType type) EffectIcon.sprite = HungerSprite; break; - case SurvivalStatType.Water: + case SurvivalStatType.Hydration: EffectIcon.sprite = ThristSprite; break; + case SurvivalStatType.Intoxication: + EffectIcon.sprite = IntoxicationSprite; + break; + default: throw new InvalidOperationException(); } diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/InventoryHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/InventoryHandler.cs index 5ecd2460a..83d574886 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/InventoryHandler.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/InventoryHandler.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; -using Assets.Zilon.Scripts; using Assets.Zilon.Scripts.Models; - +using Assets.Zilon.Scripts.Models.Modals; using JetBrains.Annotations; using UnityEngine; @@ -30,11 +29,13 @@ public class InventoryHandler : MonoBehaviour public PropInfoPopup PropInfoPopup; public GameObject UseButton; public GameObject ReadButton; + public GameObject UsePropDropArea; + public GameObject DeequipPropDropArea; - [NotNull] [Inject] private DiContainer _diContainer; - [NotNull] [Inject] private ISectorUiState _playerState; - [NotNull] [Inject] private IInventoryState _inventoryState; - [NotNull] [Inject] private ICommandManager _commandManager; + [NotNull] [Inject] private readonly DiContainer _diContainer; + [NotNull] [Inject] private readonly ISectorUiState _playerState; + [NotNull] [Inject] private readonly IInventoryState _inventoryState; + [NotNull] [Inject] private readonly ICommandManager _commandManager; [NotNull] [Inject(Id = "use-self-command")] private readonly ICommand _useSelfCommand; [NotNull] [Inject(Id = "show-history-command")] private readonly ICommand _showHistoryCommand; @@ -48,12 +49,7 @@ public InventoryHandler() public void Start() { CreateSlots(); - - // Изначально скрываем все кнопки. - // Потому что изначально никакой предмет не должен быть выбран. - // Поэтому не ясно, какие действия доступны. - UseButton.SetActive(false); - ReadButton.SetActive(false); + StartUpControls(); _actor = _playerState.ActiveActor.Actor; var inventory = _actor.Person.Inventory; @@ -66,6 +62,25 @@ public void Start() _inventoryState.SelectedPropChanged += InventoryState_SelectedPropChanged; } + /// + /// Первоначальная настройка всех элементов UI. + /// Приводим к первоначальному виду, чтобы было сложнее забыть что-нибудь отключить/скрыть + /// во время разработки. + /// + private void StartUpControls() + { + // Изначально скрываем все кнопки. + // Потому что изначально никакой предмет не должен быть выбран. + // Поэтому не ясно, какие действия доступны. + UseButton.SetActive(false); + ReadButton.SetActive(false); + + // Скрываем все области сброса. + // Потому что изначально никто никакие предметы не перетаскивает. + DeequipPropDropArea.SetActive(false); + UsePropDropArea.SetActive(false); + } + public void Update() { if (Input.GetKeyDown(KeyCode.Escape)) @@ -84,7 +99,7 @@ private void InventoryState_SelectedPropChanged(object sender, EventArgs e) PropInfoPopup.SetPropViewModel(_inventoryState.SelectedProp as IPropViewModelDescription); - UpdateUseButtonsState(_inventoryState.SelectedProp?.Prop); + UpdateUseControlsState(_inventoryState.SelectedProp as PropItemVm); } public void OnDestroy() @@ -114,9 +129,15 @@ private void CreateSlots() slotViewModel.Click += Slot_Click; slotViewModel.MouseEnter += SlotViewModel_MouseEnter; slotViewModel.MouseExit += SlotViewModel_MouseExit; + slotViewModel.DraggingStateChanged += SlotViewModel_DraggingStateChanged; } } + private void SlotViewModel_DraggingStateChanged(object sender, PropDraggingStateEventArgs e) + { + DeequipPropDropArea.SetActive(e.Dragging); + } + private void SlotViewModel_MouseExit(object sender, EventArgs e) { PropInfoPopup.SetPropViewModel(null); @@ -208,14 +229,31 @@ private static void RecalcItemsObject(Transform itemsParent, IEnumerable private void CreatePropObject(Transform itemsParent, IProp prop) { - var propItemViewModel = Instantiate(PropItemPrefab, itemsParent); + var propItemViewModelObj = _diContainer.InstantiatePrefab(PropItemPrefab, itemsParent); + + var propItemViewModel = propItemViewModelObj.GetComponent(); propItemViewModel.Init(prop); propItemViewModel.Click += PropItem_Click; + //TODO Переделать + // + propItemViewModel.DraggingStateChanged += PropItemViewModel_DraggingStateChanged; propItemViewModel.MouseEnter += PropItemViewModel_MouseEnter; propItemViewModel.MouseExit += PropItemViewModel_MouseExit; _propViewModels.Add(propItemViewModel); } + private void PropItemViewModel_DraggingStateChanged(object sender, PropDraggingStateEventArgs e) + { + var currentItemViewModel = (PropItemVm)sender; + foreach (var propViewModel in _propViewModels) + { + var isSelected = propViewModel == currentItemViewModel; + propViewModel.SetSelectedState(isSelected); + } + + UpdateUseControlsState(currentItemViewModel); + } + private void PropItemViewModel_MouseExit(object sender, EventArgs e) { PropInfoPopup.SetPropViewModel(null); @@ -238,8 +276,11 @@ private void PropItem_Click(object sender, EventArgs e) } // этот фрагмент - не дубликат - UpdateUseButtonsState(currentItemViewModel.Prop); + UpdateUseControlsState(currentItemViewModel); + // В сервисе InventoryState указываем, что текущий предмет выбран. + // Текущий - это тот, на который только что кликнули. + // Если он уже выбран, то сбрасываем выделение. if (!ReferenceEquals(_inventoryState.SelectedProp, currentItemViewModel)) { _inventoryState.SelectedProp = currentItemViewModel; @@ -252,20 +293,34 @@ private void PropItem_Click(object sender, EventArgs e) // --- этот фрагмент - не дубликат } - private void UpdateUseButtonsState(IProp currentItem) + private void UpdateUseControlsState(PropItemVm currentItemViewModel) { - if (currentItem == null) + if (currentItemViewModel?.Prop == null) { UseButton.SetActive(false); ReadButton.SetActive(false); return; } - var canUseProp = currentItem.Scheme.Use != null; - UseButton.SetActive(canUseProp); + if (currentItemViewModel.SelectAsDrag && currentItemViewModel.Prop.Scheme.Use != null) + { + UseButton.SetActive(false); + ReadButton.SetActive(false); + + UsePropDropArea.SetActive(true); + } + else + { + UsePropDropArea.SetActive(false); + + var currentItem = currentItemViewModel.Prop; - var canRead = currentItem.Scheme.Sid == HISTORY_BOOK_SID; - ReadButton.SetActive(canRead); + var canUseProp = currentItem.Scheme.Use != null; + UseButton.SetActive(canUseProp); + + var canRead = currentItem.Scheme.Sid == HISTORY_BOOK_SID; + ReadButton.SetActive(canRead); + } } public void UseButton_Handler() diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorUiHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorUiHandler.cs index 44cab9e3e..cc573d2cd 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorUiHandler.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorUiHandler.cs @@ -1,12 +1,14 @@ using JetBrains.Annotations; using UnityEngine; +using UnityEngine.SceneManagement; using UnityEngine.UI; using Zenject; using Zilon.Core.Client; using Zilon.Core.Commands; +using Zilon.Core.Tactics; //TODO Сделать отдельные крипты для каждой кнопки, которые будут содежать обработчики. //Тогда этот объект станет не нужным. @@ -15,17 +17,19 @@ /// public class SectorUiHandler : MonoBehaviour { - [NotNull] [Inject] private readonly ISectorUiState _playerState; + [Inject] private readonly ISectorUiState _playerState; - [NotNull] [Inject] private readonly ICommandManager _clientCommandExecutor; + [Inject] private readonly ISectorManager _sectorManager; - [NotNull] [Inject(Id = "next-turn-command")] private readonly ICommand _nextTurnCommand; + [Inject] private readonly ICommandManager _clientCommandExecutor; - [NotNull] [Inject(Id = "show-inventory-command")] private readonly ICommand _showInventoryCommand; + [Inject(Id = "next-turn-command")] private readonly ICommand _nextTurnCommand; - [NotNull] [Inject(Id = "show-perks-command")] private readonly ICommand _showPersonModalCommand; + [Inject(Id = "show-inventory-command")] private readonly ICommand _showInventoryCommand; - [NotNull] [Inject(Id = "quit-request-command")] private readonly ICommand _quitRequestCommand; + [Inject(Id = "show-perks-command")] private readonly ICommand _showPersonModalCommand; + + [Inject(Id = "quit-request-command")] private readonly ICommand _quitRequestCommand; [NotNull] @@ -36,6 +40,7 @@ public class SectorUiHandler : MonoBehaviour public Button InventoryButton; public Button PersonButton; public Button SectorTransitionMoveButton; + public Button CityQuickExitButton; public void FixedUpdate() { @@ -58,6 +63,14 @@ public void FixedUpdate() { SectorTransitionMoveButton.interactable = _sectorTransitionMoveCommand.CanExecute(); } + + if (CityQuickExitButton != null) + { + // Это быстрое решение. + // Проверяем, если это город, то делаем кнопку выхода видимой. + var isInCity = _sectorManager.CurrentSector?.Scheme.Sid == "city"; + CityQuickExitButton.gameObject.SetActive(isInCity); + } } public void Update() @@ -76,6 +89,11 @@ public void Update() { SectorTransitionMoveButton_Handler(); } + + if (Input.GetKeyDown(KeyCode.G)) + { + CityQuickExit_Handler(); + } } public void NextTurn() @@ -117,4 +135,11 @@ public void SectorTransitionMoveButton_Handler() { _clientCommandExecutor.Push(_sectorTransitionMoveCommand); } + + public void CityQuickExit_Handler() + { + // Это быстрое решение. + // Тупо загружаем глобальную карту. + SceneManager.LoadScene("globe"); + } } diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorVM.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorVM.cs index c3cdeac33..41c156b21 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorVM.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/SectorScene/SectorVM.cs @@ -107,6 +107,8 @@ public class SectorVM : MonoBehaviour [Inject] private readonly IHumanPersonFactory _humanPersonFactory; + [Inject] private readonly ScoreStorage _scoreStorage; + [NotNull] [Inject(Id = "move-command")] private readonly ICommand _moveCommand; @@ -663,6 +665,17 @@ private ActorViewModel CreateHumanActorViewModel([NotNull] IPlayer player, private void HumanPersonSurvival_Dead(object sender, EventArgs e) { + var scores = _scoreManager.Scores; + + try + { + _scoreStorage.AppendScores("test", scores); + } + catch (Exception exception) + { + Debug.LogError("Не удалось выполнить запись результатов в БД\n" + exception.ToString()); + } + _container.InstantiateComponentOnNewGameObject(nameof(GameOverEffect)); _humanActorTaskSource.CurrentActor.Person.Survival.Dead -= HumanPersonSurvival_Dead; diff --git a/Zilon.Client/Assets/Zilon/Scripts/Models/TitleScene/TitleHandler.cs b/Zilon.Client/Assets/Zilon/Scripts/Models/TitleScene/TitleHandler.cs index ac46d8ae9..1e3b9fe1b 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Models/TitleScene/TitleHandler.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Models/TitleScene/TitleHandler.cs @@ -28,4 +28,14 @@ public void OpenRepoUrlHandler() { Application.OpenURL("https://github.com/kreghek/Zilon_Roguelike"); } + + public void OpenVkUrlHandler() + { + Application.OpenURL("https://vk.com/last_imperial_vagabond"); + } + + public void OpenBlogUrlHandler() + { + Application.OpenURL("https://lastimperialvagabond.home.blog/"); + } } diff --git a/Zilon.Client/Assets/Zilon/Scripts/SectorInstaller.cs b/Zilon.Client/Assets/Zilon/Scripts/SectorInstaller.cs index d32f11395..7421c9c7e 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/SectorInstaller.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/SectorInstaller.cs @@ -87,11 +87,13 @@ public override void InstallBindings() Container.Bind().WithId("show-trader-modal-command").To().AsSingle(); Container.Bind().WithId("show-dialog-modal-command").To().AsSingle(); Container.Bind().WithId("show-history-command").To().AsSingle(); + Container.Bind().WithId("quit-request-command").To().AsSingle(); // Специализированные команды для Ui. Container.Bind().WithId("equip-command").To().AsTransient(); Container.Bind().WithId("prop-transfer-command").To().AsTransient(); - Container.Bind().WithId("quit-request-command").To().AsSingle(); + + Container.Bind().AsSingle(); } private void RegisterBotLogics(DiContainer container) diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs b/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs new file mode 100644 index 000000000..0843a6855 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs @@ -0,0 +1,12 @@ +namespace Assets.Zilon.Scripts.Services +{ + public sealed class AggregateScores + { + public float AvgScores { get; set; } + public float MaxScores { get; set; } + public float AvgFrags { get; set; } + public float MaxFrags { get; set; } + public float AvgTurns { get; set; } + public float MaxTurns { get; set; } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs.meta new file mode 100644 index 000000000..2f74410a4 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/AggregateScores.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8927b4d26298b9c46bbae1a91545e4e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/ProgressStorageService.cs b/Zilon.Client/Assets/Zilon/Scripts/Services/ProgressStorageService.cs index bce894eb1..99462807b 100644 --- a/Zilon.Client/Assets/Zilon/Scripts/Services/ProgressStorageService.cs +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/ProgressStorageService.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; + using Newtonsoft.Json; using UnityEngine; diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs new file mode 100644 index 000000000..6ef823f8e --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs @@ -0,0 +1,159 @@ +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Linq; + +using Mono.Data.SqliteClient; + +using Newtonsoft.Json; + +using UnityEngine; + +using Zilon.Core.ProgressStoring; +using Zilon.Core.Scoring; +using Zilon.Core.Tactics; + +namespace Assets.Zilon.Scripts.Services +{ + public sealed class ScoreStorage + { + public void AppendScores(string personName, Scores scores) + { + var pathToDb = Path.Combine(Application.persistentDataPath, "data.bytes"); + var connectionString = $"URI=file:{pathToDb}"; + using (var connection = new SqliteConnection(connectionString)) + { + connection.Open(); + + CreateScoresTableIfNotExists(connection); + + var fragSum = scores.Frags.Sum(x => x.Value); + var scoreStorageData = ScoresStorageData.Create(scores); + var summarySerialized = JsonConvert.SerializeObject(scoreStorageData); + var textSummary = TextSummaryHelper.CreateTextSummary(scores); + using (var command = connection.CreateCommand()) + { + command.CommandText = $@"INSERT INTO [Scores](Name, Preffix, Mode, Scores, Turns, Frags, Summary, TextSummary) + VALUES ('{personName}', 'preffix', 'mode', {scores.BaseScores}, {scores.Turns}, {fragSum}, '{summarySerialized}', '{textSummary}')"; + command.CommandType = CommandType.Text; + command.ExecuteNonQuery(); + } + + connection.Close(); + } + } + + public ScoresRecord[] ReadScores() + { + var recordList = new List(); + + var pathToDb = Path.Combine(Application.persistentDataPath, "data.bytes"); + var connectionString = $"URI=file:{pathToDb}"; + using (var connection = new SqliteConnection(connectionString)) + { + connection.Open(); + + CreateScoresTableIfNotExists(connection); + + using (var command = connection.CreateCommand()) + { + command.CommandText = "SELECT Name, Scores, TextSummary FROM [Scores] ORDER BY Scores DESC"; + command.CommandType = CommandType.Text; + using (var reader = command.ExecuteReader()) + { + var number = 1; + + while (reader.Read()) + { + var record = new ScoresRecord + { + Number = number, + Name = reader.GetString(0), + Scores = reader.GetInt32(1) + }; + + recordList.Add(record); + + number++; + } + } + } + connection.Close(); + } + + return recordList.ToArray(); + } + + public AggregateScores ReadAggregateScores() + { + // По умолчанию все значения пустые. + // Предположительно, это будет использовать в самом начале игры, когда нет записей. + var aggregateScores = new AggregateScores(); + + var pathToDb = Path.Combine(Application.persistentDataPath, "data.bytes"); + var connectionString = $"URI=file:{pathToDb}"; + using (var connection = new SqliteConnection(connectionString)) + { + connection.Open(); + + CreateScoresTableIfNotExists(connection); + + using (var command = connection.CreateCommand()) + { + command.CommandText = @"SELECT + MIN([Scores]) AS MinScores + ,ROUND(AVG([Scores]), 1) AS AvgScores + ,MAX([Scores]) AS MaxScores + ,MIN([Turns]) AS MinTurns + ,ROUND(AVG([Turns]), 1) AS AvgTurns + ,MAX([Turns]) AS MaxTurns + ,MIN([Frags]) AS MinFrags + ,ROUND(AVG([Frags]), 1) AS AvgFrags + ,MAX([Frags]) AS MaxFrags + FROM [Scores] + GROUP BY [Name] ,[Preffix] ,[Mode]"; + command.CommandType = CommandType.Text; + using (var reader = command.ExecuteReader()) + { + if (reader.Read()) + { + aggregateScores = new AggregateScores + { + AvgScores = reader.GetFloat(1), + MaxScores = reader.GetFloat(2), + AvgTurns = reader.GetFloat(4), + MaxTurns = reader.GetFloat(5), + AvgFrags = reader.GetFloat(7), + MaxFrags = reader.GetFloat(8) + }; + } + } + } + connection.Close(); + } + + return aggregateScores; + } + + private static void CreateScoresTableIfNotExists(SqliteConnection connection) + { + using (var command = connection.CreateCommand()) + { + command.CommandText = @"CREATE TABLE IF NOT EXISTS [Scores]( + Id INTEGER PRIMARY KEY AUTOINCREMENT, + Name TEXT NOT NULL, + Preffix TEXT NULL, + Mode TEXT NULL, + TimeStamp TEXT NOT NULL DEFAULT (datetime(current_timestamp)), + Scores INTEGER NULL, + Turns INTEGER NULL, + Frags INTEGER NULL, + Summary TEXT NULL, + TextSummary TEXT NULL + );"; + command.CommandType = CommandType.Text; + command.ExecuteNonQuery(); + } + } + } +} \ No newline at end of file diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs.meta new file mode 100644 index 000000000..0a0f569cc --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoreStorage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 41c8bfba41f805645bee4f199e935adf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs new file mode 100644 index 000000000..ccfc66cf5 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs @@ -0,0 +1,10 @@ +namespace Assets.Zilon.Scripts.Services +{ + public sealed class ScoresRecord + { + public int Number { get; set; } + public string Name { get; set; } + + public int Scores { get; set; } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs.meta new file mode 100644 index 000000000..0f199f0ee --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/ScoresRecord.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 78cb07f2bf4c31947ac54b2f6214bdb9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs b/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs new file mode 100644 index 000000000..195262781 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; + +using Zenject; + +using Zilon.Core.Commands; + +namespace Assets.Zilon.Scripts.Services +{ + public class SpecialCommandManager + { + private readonly DiContainer _diContainer; + private readonly Dictionary _equipCommandDict; + + public SpecialCommandManager(DiContainer diContainer) + { + _diContainer = diContainer; + + _equipCommandDict = new Dictionary(); + } + + public EquipCommand GetEquipCommand(int slotIndex) + { + if (_equipCommandDict.TryGetValue(slotIndex, out var equipCommand)) + { + return equipCommand; + } + + equipCommand = _diContainer.ResolveId("equip-command") as EquipCommand; + _equipCommandDict[slotIndex] = equipCommand; + equipCommand.SlotIndex = slotIndex; + + return equipCommand; + } + } +} diff --git a/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs.meta b/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs.meta new file mode 100644 index 000000000..59f0d6f8b --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Scripts/Services/SpecialCommandManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f9dffe0b1a3658643b0a2d8c4b6e97e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png b/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png new file mode 100644 index 000000000..30e198d57 Binary files /dev/null and b/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png differ diff --git a/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png.meta b/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png.meta new file mode 100644 index 000000000..923af9691 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Sprites/Props/closed-leather-helmet-front.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 8582d926e54d5cb459068c94869eb764 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png b/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png new file mode 100644 index 000000000..f30be527b Binary files /dev/null and b/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png differ diff --git a/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png.meta b/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png.meta new file mode 100644 index 000000000..7429ca8af --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Sprites/VK.com-logo.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 60930e5a76f75cd418e60c0b02488917 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Sprites/github-logo.png b/Zilon.Client/Assets/Zilon/Sprites/github-logo.png new file mode 100644 index 000000000..acd5d2429 Binary files /dev/null and b/Zilon.Client/Assets/Zilon/Sprites/github-logo.png differ diff --git a/Zilon.Client/Assets/Zilon/Sprites/github-logo.png.meta b/Zilon.Client/Assets/Zilon/Sprites/github-logo.png.meta new file mode 100644 index 000000000..696ae3b82 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Sprites/github-logo.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 7e85c7ca3eafba546bcbb2cc16666a4e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Sprites/intoxication.png b/Zilon.Client/Assets/Zilon/Sprites/intoxication.png new file mode 100644 index 000000000..17c5467b7 Binary files /dev/null and b/Zilon.Client/Assets/Zilon/Sprites/intoxication.png differ diff --git a/Zilon.Client/Assets/Zilon/Sprites/intoxication.png.meta b/Zilon.Client/Assets/Zilon/Sprites/intoxication.png.meta new file mode 100644 index 000000000..0a38c31b4 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Sprites/intoxication.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 7435ccb2a8741f248bd74b9b00629f32 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/Assets/Zilon/Sprites/website-logo.png b/Zilon.Client/Assets/Zilon/Sprites/website-logo.png new file mode 100644 index 000000000..0771cfdaf Binary files /dev/null and b/Zilon.Client/Assets/Zilon/Sprites/website-logo.png differ diff --git a/Zilon.Client/Assets/Zilon/Sprites/website-logo.png.meta b/Zilon.Client/Assets/Zilon/Sprites/website-logo.png.meta new file mode 100644 index 000000000..a0ff60010 --- /dev/null +++ b/Zilon.Client/Assets/Zilon/Sprites/website-logo.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: c6f5f64361898cf498103428c637b362 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Zilon.Client/ProjectSettings/EditorBuildSettings.asset b/Zilon.Client/ProjectSettings/EditorBuildSettings.asset index 279e08290..c642cdf0a 100644 --- a/Zilon.Client/ProjectSettings/EditorBuildSettings.asset +++ b/Zilon.Client/ProjectSettings/EditorBuildSettings.asset @@ -14,4 +14,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Zilon/Scenes/globe.unity guid: 380d1fcc57970684ba510afd99f0ecdd + - enabled: 1 + path: Assets/Zilon/Scenes/scores.unity + guid: 721f50cc8827c684bac660610525f7a9 m_configObjects: {} diff --git a/Zilon.Client/ProjectSettings/ProjectSettings.asset b/Zilon.Client/ProjectSettings/ProjectSettings.asset index e9200b05c..1665f3e14 100644 --- a/Zilon.Client/ProjectSettings/ProjectSettings.asset +++ b/Zilon.Client/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 17 productGUID: e07fadfc7553ff34496da472952186e7 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -65,6 +65,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -79,6 +80,7 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games @@ -125,7 +127,6 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -140,10 +141,18 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 0 dashSupport: 0 + lowOverheadMode: 0 enable360StereoCapture: 0 + isWsaHolographicRemotingEnabled: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 @@ -155,7 +164,7 @@ PlayerSettings: applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -192,6 +201,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -243,7 +256,7 @@ PlayerSettings: AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 @@ -251,20 +264,24 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] - m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 + vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -448,6 +465,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -481,6 +499,7 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -495,6 +514,7 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 0 webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: {} platformArchitecture: {} scriptingBackend: @@ -505,7 +525,10 @@ PlayerSettings: allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - apiCompatibilityLevelPerPlatform: {} + gcIncremental: 0 + gcWBarrierValidation: 0 + apiCompatibilityLevelPerPlatform: + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Zilon @@ -535,7 +558,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -560,7 +582,6 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -574,7 +595,7 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 diff --git a/Zilon.Core/Zilon.Bot.Players/Logics/EatProviantLogicState.cs b/Zilon.Core/Zilon.Bot.Players/Logics/EatProviantLogicState.cs index 3ecef3f01..1c2a3d2f6 100644 --- a/Zilon.Core/Zilon.Bot.Players/Logics/EatProviantLogicState.cs +++ b/Zilon.Core/Zilon.Bot.Players/Logics/EatProviantLogicState.cs @@ -19,7 +19,7 @@ public override IActorTask GetTask(IActor actor, ILogicStrategyData strategyData return eatFoodTask; } - var drinkWaterTask = CheckHazard(actor, SurvivalStatType.Water, ConsumeCommonRuleType.Thirst); + var drinkWaterTask = CheckHazard(actor, SurvivalStatType.Hydration, ConsumeCommonRuleType.Thirst); if (drinkWaterTask != null) { return drinkWaterTask; diff --git a/Zilon.Core/Zilon.Bot.Players/Triggers/ThirstAndHasResourceTrigger.cs b/Zilon.Core/Zilon.Bot.Players/Triggers/ThirstAndHasResourceTrigger.cs index fcb3626df..af7997af9 100644 --- a/Zilon.Core/Zilon.Bot.Players/Triggers/ThirstAndHasResourceTrigger.cs +++ b/Zilon.Core/Zilon.Bot.Players/Triggers/ThirstAndHasResourceTrigger.cs @@ -17,7 +17,7 @@ public void Reset() public bool Test(IActor actor, ILogicState currentState, ILogicStrategyData strategyData) { var hazardEffect = actor.Person.Effects.Items.OfType() - .SingleOrDefault(x => x.Type == SurvivalStatType.Water); + .SingleOrDefault(x => x.Type == SurvivalStatType.Hydration); if (hazardEffect == null) { return false; diff --git a/Zilon.Core/Zilon.Core.MassSectorGenerator/Program.cs b/Zilon.Core/Zilon.Core.MassSectorGenerator/Program.cs index 28b01a1dc..77bbe794a 100644 --- a/Zilon.Core/Zilon.Core.MassSectorGenerator/Program.cs +++ b/Zilon.Core/Zilon.Core.MassSectorGenerator/Program.cs @@ -38,20 +38,36 @@ static async System.Threading.Tasks.Task Main(string[] args) { var sectorFactory = scopeContainer.GetInstance(); var sector = await sectorFactory.GenerateDungeonAsync(sectorLevel); + sector.Scheme = sectorScheme; // Проверка + // Проверка сундуков. + // Сундуки не должны генерироваться на узлы, которые являются препятствием. + // Сундуки не должны генерироваться на узлы с выходом. var containerManager = scopeContainer.GetInstance(); var allContainers = containerManager.Items; foreach (var container in allContainers) { + // Проверяем, что сундук не стоит на препятствии. var hex = (HexNode)container.Node; if (hex.IsObstacle) { - throw new System.Exception(); + throw new Exception(); + } + + // Проверяем, что сундук не на клетке с выходом. + var transitionNodes = sector.Map.Transitions.Keys; + var chestOnTransitionNode = transitionNodes.Contains(container.Node); + if (chestOnTransitionNode) + { + throw new Exception(); } } + // Проверка монстров. + // Монстры не должны генерироваться на узлах с препятствием. + // Монстры не должны генерироваться на узлах с сундуками. var actorManager = scopeContainer.GetInstance(); var allMonsters = actorManager.Items; var containerNodes = allContainers.Select(x => x.Node); @@ -60,13 +76,34 @@ static async System.Threading.Tasks.Task Main(string[] args) var hex = (HexNode)actor.Node; if (hex.IsObstacle) { - throw new System.Exception(); + throw new Exception(); } var monsterIsOnContainer = containerNodes.Contains(actor.Node); if (monsterIsOnContainer) { - throw new System.Exception(); + throw new Exception(); + } + } + + // Проверка переходов. + // Все переходы на уровне должны либо вести на глобальную карту, + // либо на корректный уровень сектора. + var transitions = sector.Map.Transitions.Values; + foreach (var transition in transitions) + { + var targetSectorSid = transition.SectorSid; + if (targetSectorSid == null) + { + // Это значит, что переход на глобальную карту. + // Нормальная ситуация, проверяем следующий переход. + continue; + } + + var sectorLevelBySid = sector.Scheme.SectorLevels.SingleOrDefault(level => level.Sid == targetSectorSid); + if (sectorLevelBySid == null) + { + throw new Exception($"Не найден уровень сектора {targetSectorSid}, указанный в переходе."); } } } diff --git a/Zilon.Core/Zilon.Core.Spec/Steps/SurvivalSteps.cs b/Zilon.Core/Zilon.Core.Spec/Steps/SurvivalSteps.cs index 9c18a8b35..eb5ffe4e5 100644 --- a/Zilon.Core/Zilon.Core.Spec/Steps/SurvivalSteps.cs +++ b/Zilon.Core/Zilon.Core.Spec/Steps/SurvivalSteps.cs @@ -102,7 +102,7 @@ public void GivenАктёрЗначениеСытостьРавное(string sta break; case "вода": - statType = SurvivalStatType.Water; + statType = SurvivalStatType.Hydration; break; default: @@ -171,7 +171,7 @@ public void ThenЗначениеStatУменьшилосьНаRate(string stat, break; case "вода": - GetSurvivalValue(actor, SurvivalStatType.Water).Should().Be(expectedValue); + GetSurvivalValue(actor, SurvivalStatType.Hydration).Should().Be(expectedValue); break; default: @@ -191,7 +191,7 @@ public void ThenЗначениеСытостиПовысилосьНаЕдини break; case "вода": - GetSurvivalValue(actor, SurvivalStatType.Water).Should().Be(expectedValue); + GetSurvivalValue(actor, SurvivalStatType.Hydration).Should().Be(expectedValue); break; default: @@ -211,7 +211,7 @@ public void ThenЗначениеStatСтало(string stat, int expectedValue) break; case "вода": - survivalStatValue = GetSurvivalValue(actor, SurvivalStatType.Water); + survivalStatValue = GetSurvivalValue(actor, SurvivalStatType.Hydration); break; default: @@ -272,17 +272,17 @@ private static void GetEffectStatAndLevelByName(string effectName, out SurvivalS case "Слабая жажда": level = SurvivalStatHazardLevel.Lesser; - stat = SurvivalStatType.Water; + stat = SurvivalStatType.Hydration; break; case "Жажда": level = SurvivalStatHazardLevel.Strong; - stat = SurvivalStatType.Water; + stat = SurvivalStatType.Hydration; break; case "Обезвоживание": level = SurvivalStatHazardLevel.Max; - stat = SurvivalStatType.Water; + stat = SurvivalStatType.Hydration; break; default: diff --git a/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonScheme.cs b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonScheme.cs index fd5ea02e8..d8987c47b 100644 --- a/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonScheme.cs +++ b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonScheme.cs @@ -7,5 +7,6 @@ public sealed class TestPersonScheme : SchemeBase, IPersonScheme public string DefaultAct { get; set; } public int Hp { get; set; } public PersonSlotSubScheme[] Slots { get; set; } + public IPersonSurvivalStatSubScheme[] SurvivalStats { get; set; } } } diff --git a/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatKeyPointSubScheme.cs b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatKeyPointSubScheme.cs new file mode 100644 index 000000000..1efcaf55e --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatKeyPointSubScheme.cs @@ -0,0 +1,11 @@ +using Zilon.Core.Schemes; + +namespace Zilon.Core.Tests.Common.Schemes +{ + public sealed class TestPersonSurvivalStatKeyPointSubScheme: IPersonSurvivalStatKeyPointSubScheme + { + public PersonSurvivalStatKeypointLevel Level { get; set; } + + public int Value { get; set; } + } +} diff --git a/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatSubScheme.cs b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatSubScheme.cs new file mode 100644 index 000000000..bbf1fa95c --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests.Common/Schemes/TestPersonSurvivalStatSubScheme.cs @@ -0,0 +1,13 @@ +using Zilon.Core.Schemes; + +namespace Zilon.Core.Tests.Common.Schemes +{ + public sealed class TestPersonSurvivalStatSubScheme : IPersonSurvivalStatSubScheme + { + public PersonSurvivalStatType Type { get; set; } + public IPersonSurvivalStatKeyPointSubScheme[] KeyPoints { get; set; } + public int StartValue { get; set; } + public int MinValue { get; set; } + public int MaxValue { get; set; } + } +} diff --git a/Zilon.Core/Zilon.Core.Tests.Common/Zilon.Core.Tests.Common.csproj b/Zilon.Core/Zilon.Core.Tests.Common/Zilon.Core.Tests.Common.csproj index f7ffde4f3..771e0141e 100644 --- a/Zilon.Core/Zilon.Core.Tests.Common/Zilon.Core.Tests.Common.csproj +++ b/Zilon.Core/Zilon.Core.Tests.Common/Zilon.Core.Tests.Common.csproj @@ -51,6 +51,8 @@ + + diff --git a/Zilon.Core/Zilon.Core.Tests/Persons/Auxiliary/PersonEffectHelperTests.cs b/Zilon.Core/Zilon.Core.Tests/Persons/Auxiliary/PersonEffectHelperTests.cs index c72278eb8..5dd575ece 100644 --- a/Zilon.Core/Zilon.Core.Tests/Persons/Auxiliary/PersonEffectHelperTests.cs +++ b/Zilon.Core/Zilon.Core.Tests/Persons/Auxiliary/PersonEffectHelperTests.cs @@ -19,7 +19,7 @@ public class PersonEffectHelperTests /// то эффект изымается. /// [Test] - public void UpdateSurvivalEffect_HasLesserEffectAndValueMoreThatKetValue_HasNoEffect() + public void UpdateSurvivalEffect_HasLesserEffectAndValueMoreThatKetValueInNegativeKeyPoints_HasNoEffect() { //ARRANGE @@ -32,7 +32,8 @@ public void UpdateSurvivalEffect_HasLesserEffectAndValueMoreThatKetValue_HasNoEf currentEffects.Add(testedEffect); - var stat = new SurvivalStat(1, -10, 10) + // Значение - 1, а ключевая точка - 0 + var stat = new SurvivalStat(startValue: 1, min: -10, max: 10) { Type = SurvivalStatType.Satiety, KeyPoints = new[] { @@ -58,10 +59,10 @@ public void UpdateSurvivalEffect_HasLesserEffectAndValueMoreThatKetValue_HasNoEf /// /// Тест проверяет, что если значение увеличилось выше, чем ключевая точка эффекта выше уровнем, - /// то эффект снижает уровень. + /// то эффект снижает уровень. Рассматриваем отрицательные значения ключевых точек. /// [Test] - public void UpdateSurvivalEffect_HasStrongEffectAndValueMoreThatKeyValue_HasLesserEffect() + public void UpdateSurvivalEffect_HasStrongEffectAndValueMoreThatKeyValueInNegativeKeyPoints_HasLesserEffect() { //ARRANGE @@ -72,12 +73,16 @@ public void UpdateSurvivalEffect_HasStrongEffectAndValueMoreThatKeyValue_HasLess var currentEffects = new EffectCollection(); var testedEffect = new SurvivalStatHazardEffect(expectedSurvivalHazardType, - SurvivalStatHazardLevel.Lesser, + SurvivalStatHazardLevel.Strong, survivalRandomSource); currentEffects.Add(testedEffect); - var stat = new SurvivalStat(-5, -10, 10) + // Предполагаем, что первоначально эффект был Strong на -10. + // Затем значение изменилось на -5. + // Мы прошли ключевую точку -10 Strong на увеличение. + // Это должно снизить уровень эффекта на Lesser. + var stat = new SurvivalStat(startValue: -5, min: -10, max: 10) { Type = expectedSurvivalHazardType, KeyPoints = new[] { @@ -109,7 +114,7 @@ public void UpdateSurvivalEffect_HasStrongEffectAndValueMoreThatKeyValue_HasLess /// то эффект снижает уровень. /// [Test] - public void UpdateSurvivalEffect_HasMaxEffectAndValueMoreThatKeyValue_HasStrongEffect() + public void UpdateSurvivalEffect_HasMaxEffectAndValueMoreThatKeyValueInNegativeKeyPoints_HasStrongEffect() { //ARRANGE @@ -120,23 +125,82 @@ public void UpdateSurvivalEffect_HasMaxEffectAndValueMoreThatKeyValue_HasStrongE var currentEffects = new EffectCollection(); var testedEffect = new SurvivalStatHazardEffect(expectedSurvivalHazardType, - SurvivalStatHazardLevel.Strong, + SurvivalStatHazardLevel.Max, survivalRandomSource); currentEffects.Add(testedEffect); - var stat = new SurvivalStat(-5, -10, 10) + // Предполагаем, что первоначально эффект был Max на -10. + // Затем значение изменилось на -5. + // Мы прошли ключевую точку -10 Max на увеличение. + // Это должно снизить уровень эффекта на Strong. + var stat = new SurvivalStat(startValue: -5, min: -10, max: 10) { Type = expectedSurvivalHazardType, KeyPoints = new[] { - new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Lesser, 5), - new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Strong, 0), + // Внимание! + // Сейчас все ключевые чтоки должны быть либо слева от нуля включая ноль. + // Либо справа от нуля. + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Lesser, 0), + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Strong, -2), new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Max, -10) } }; + // ACT + PersonEffectHelper.UpdateSurvivalEffect(currentEffects, + stat, + new[] { stat.KeyPoints[2] }, + survivalRandomSource); + + + + // ASSERT + var factEffect = currentEffects.Items + .OfType() + .Single(x => x.Type == expectedSurvivalHazardType); + + factEffect.Level.Should().Be(SurvivalStatHazardLevel.Strong); + } + + /// + /// Тест проверяет, что при прохождении ключевой точки Max эффект понижает уровень. + /// Данный тест работает с положительными ключевыми точками. + /// + [Test] + public void UpdateSurvivalEffect_HasMaxEffectAndValueLessThatKeyValueInPositiveKeyPoints_HasStrongEffect() + { + //ARRANGE + + const SurvivalStatType expectedSurvivalHazardType = SurvivalStatType.Intoxication; + + var survivalRandomSource = CreateMaxRollsRandomSource(); + + var currentEffects = new EffectCollection(); + + var testedEffect = new SurvivalStatHazardEffect(expectedSurvivalHazardType, + SurvivalStatHazardLevel.Max, + survivalRandomSource); + + currentEffects.Add(testedEffect); + + // Предполагаем, что первоначально эффект был Max на 111. + // Затем значение изменилось на 110. Мы прошли ключевую точку 111 Max в сторону меньшего уровня. + // Это должно снизить уровень эффекта на Strong. + var stat = new SurvivalStat(110, 0, 150) + { + Type = expectedSurvivalHazardType, + KeyPoints = new[] { + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Lesser, 30), + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Strong, 60), + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Max, 111) + } + }; + + + // ACT PersonEffectHelper.UpdateSurvivalEffect(currentEffects, stat, diff --git a/Zilon.Core/Zilon.Core.Tests/Persons/HumanPersonTests.cs b/Zilon.Core/Zilon.Core.Tests/Persons/HumanPersonTests.cs index a00337bdc..301ac863f 100644 --- a/Zilon.Core/Zilon.Core.Tests/Persons/HumanPersonTests.cs +++ b/Zilon.Core/Zilon.Core.Tests/Persons/HumanPersonTests.cs @@ -998,6 +998,25 @@ public void HumanPerson_EquipPropWithHungerResistance_DownPassOfSatietyDescrease { Types = EquipmentSlotTypes.Aux } + }, + + SurvivalStats = new[] + { + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Satiety, + MinValue = -100, + MaxValue = 100, + StartValue = 0 + }, + + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Hydration, + MinValue = -100, + MaxValue = 100, + StartValue = 0 + } } }; diff --git a/Zilon.Core/Zilon.Core.Tests/Persons/ISurvivalDataExtensionsTests.cs b/Zilon.Core/Zilon.Core.Tests/Persons/ISurvivalDataExtensionsTests.cs new file mode 100644 index 000000000..2be3fa755 --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests/Persons/ISurvivalDataExtensionsTests.cs @@ -0,0 +1,51 @@ +using System.Linq; + +using FluentAssertions; + +using NUnit.Framework; + +using Zilon.Core.Tests.Persons.TestCases; + +namespace Zilon.Core.Persons.Tests +{ + [TestFixture] + public class ISurvivalDataExtensionsTests + { + /// + /// Тест проверяет, что при изменении значения в указанном диапазоне + /// мы проходим через все предполагаемые ключевые точки. + /// + [Test] + [TestCaseSource(typeof(ISurvivalDataExtensionsTestCaseSource), nameof(ISurvivalDataExtensionsTestCaseSource.CalcKeyPointTestCases))] + public void CalcKeyPointsInRange_TestCases(int lesserKeyPoint, int strongKeyPoint, int maxKeyPoint, + int minValue, int maxValue, + SurvivalStatHazardLevel? passedKeyPoint0, + SurvivalStatHazardLevel? passedKeyPoint1, + SurvivalStatHazardLevel? passedKeyPoint2) + { + // ARRANGE + + var keyPoints = new[] { + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Lesser, lesserKeyPoint), + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Strong, strongKeyPoint), + new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Max, maxKeyPoint) + }; + + + + // ACT + + var crossedKeyPoints = keyPoints.CalcKeyPointsInRange(minValue, maxValue); + + + + // ASSERT + var expectedKeyPointsWithNulls = new[] { passedKeyPoint0, passedKeyPoint1, passedKeyPoint2 }; + var expectedKeyPoints = expectedKeyPointsWithNulls.Where(x => x != null).Select(x => x.Value).ToArray(); + + var factKeyPoints = crossedKeyPoints.Select(x => x.Level).ToArray(); + + factKeyPoints.Should().BeEquivalentTo(expectedKeyPoints); + } + } +} \ No newline at end of file diff --git a/Zilon.Core/Zilon.Core.Tests/Persons/SurvivalDataTests.cs b/Zilon.Core/Zilon.Core.Tests/Persons/SurvivalDataTests.cs index a9a740496..7f2446400 100644 --- a/Zilon.Core/Zilon.Core.Tests/Persons/SurvivalDataTests.cs +++ b/Zilon.Core/Zilon.Core.Tests/Persons/SurvivalDataTests.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using Zilon.Core.Persons; +using Zilon.Core.Schemes; using Zilon.Core.Tests.Common.Schemes; using Zilon.Core.Tests.Persons.TestCases; @@ -166,13 +167,13 @@ public void RestoreStat_StatNearKeyPoint_RaiseEventWithCorrectValues2() var stat = survivalData.Stats.Single(x => x.Type == SurvivalStatType.Satiety); stat.Value = stat.KeyPoints[1].Value; - var stat2 = survivalData.Stats.Single(x => x.Type == SurvivalStatType.Water); + var stat2 = survivalData.Stats.Single(x => x.Type == SurvivalStatType.Hydration); stat2.Value = stat2.KeyPoints[1].Value; // ACT using (var monitor = survivalData.Monitor()) { - survivalData.RestoreStat(SurvivalStatType.Water, 3); + survivalData.RestoreStat(SurvivalStatType.Hydration, 3); @@ -246,7 +247,59 @@ public void TakeDamage_FatalDamage_FiresEvent() [SetUp] public void SetUp() { - _personScheme = new TestPersonScheme(); + _personScheme = new TestPersonScheme { + SurvivalStats = new[] { + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Satiety, + MinValue = -100, + MaxValue = 100, + StartValue = 0, + KeyPoints = new []{ + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Lesser, + Value = 0 + }, + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Strong, + Value = -25 + }, + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Max, + Value = -75 + } + } + }, + + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Hydration, + MinValue = -100, + MaxValue = 100, + StartValue = 0, + KeyPoints = new []{ + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Lesser, + Value = 0 + }, + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Strong, + Value = -25 + }, + new TestPersonSurvivalStatKeyPointSubScheme + { + Level = PersonSurvivalStatKeypointLevel.Max, + Value = -75 + } + } + } + } + }; var survivalRandomSourceMock = new Mock(); _survivalRandomSource = survivalRandomSourceMock.Object; diff --git a/Zilon.Core/Zilon.Core.Tests/Persons/TestCases/ISurvivalDataExtensionsTestCaseSource.cs b/Zilon.Core/Zilon.Core.Tests/Persons/TestCases/ISurvivalDataExtensionsTestCaseSource.cs new file mode 100644 index 000000000..4ebbbb9d9 --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests/Persons/TestCases/ISurvivalDataExtensionsTestCaseSource.cs @@ -0,0 +1,47 @@ +using System.Collections; + +using NUnit.Framework; + +using Zilon.Core.Persons; + +namespace Zilon.Core.Tests.Persons.TestCases +{ + public static class ISurvivalDataExtensionsTestCaseSource + { + public static IEnumerable CalcKeyPointTestCases { + get { + // Формат тестовых данных. + // Значения 3 ключевых точек в порядке увеличения уровня Lesser, Strong, Max. + // Проверяемый диапазон min, max. + // Nullable для ключевых точек, которые должны быть пройдены. + + // Нужно помнить, что ключевые точки сейчас могут быть расположены только либо с лева от 0. + // Либо справа от нуля. См. summary для ключевых точек. + + yield return new TestCaseData(25, 50, 100, + 0, 51, + SurvivalStatHazardLevel.Lesser, + SurvivalStatHazardLevel.Strong, + null); + + yield return new TestCaseData(25, 50, 100, + 99, 100, + SurvivalStatHazardLevel.Max, + null, + null); + + yield return new TestCaseData(1, 2, 3, + 0, 3, + SurvivalStatHazardLevel.Lesser, + SurvivalStatHazardLevel.Strong, + SurvivalStatHazardLevel.Max); + + yield return new TestCaseData(-25, -50, -100, + 0, -51, + SurvivalStatHazardLevel.Lesser, + SurvivalStatHazardLevel.Strong, + null); + } + } + } +} diff --git a/Zilon.Core/Zilon.Core.Tests/ProgressStoring/HumanPersonStorageDataTests.cs b/Zilon.Core/Zilon.Core.Tests/ProgressStoring/HumanPersonStorageDataTests.cs index 81e7d8608..d47e8327a 100644 --- a/Zilon.Core/Zilon.Core.Tests/ProgressStoring/HumanPersonStorageDataTests.cs +++ b/Zilon.Core/Zilon.Core.Tests/ProgressStoring/HumanPersonStorageDataTests.cs @@ -40,6 +40,16 @@ public void Restore_MinimunPersonAfterSave_RestoredPersonEqualsOriginal() DefaultAct = "default", Slots = new[] { new PersonSlotSubScheme { Types = EquipmentSlotTypes.Head }, + }, + SurvivalStats = new[]{ + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Satiety + }, + new TestPersonSurvivalStatSubScheme + { + Type = PersonSurvivalStatType.Hydration + } } } } }; diff --git a/Zilon.Core/Zilon.Core.Tests/Schemes/PersonSchemeTests.cs b/Zilon.Core/Zilon.Core.Tests/Schemes/PersonSchemeTests.cs new file mode 100644 index 000000000..80e880e20 --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests/Schemes/PersonSchemeTests.cs @@ -0,0 +1,66 @@ +using System.IO; +using FluentAssertions; + +using Newtonsoft.Json; + +using NUnit.Framework; + +using Zilon.Core.Schemes; +using Zilon.Core.Tests.Common.Schemes; + +namespace Zilon.Core.Tests.Schemes +{ + [TestFixture] + public class PersonSchemeTests + { + /// + /// Тест проверяет, что работы корректно десериализуется. + /// + [Test] + public void Deserialization_SurvivalStats_ValueRangeAndKeyPointsAreCorrect() + { + // ARRANGE + var assembly = GetType().Assembly; + var resourceName = "Zilon.Core.Tests.Schemes.human-person.json"; + + string sourceText; + using (Stream stream = assembly.GetManifestResourceStream(resourceName)) + using (StreamReader reader = new StreamReader(stream)) + { + sourceText = reader.ReadToEnd(); + } + + + + // ACT + var factPersonScheme = JsonConvert.DeserializeObject(sourceText); + + + + // ASSERT + + // Значение взяты из схемы, которая приложена, как ресурс. + // Может не совпадать с фактическими значениями в боевой схеме. + factPersonScheme.SurvivalStats[0].Type.Should().Be(PersonSurvivalStatType.Satiety); + factPersonScheme.SurvivalStats[0].MinValue.Should().Be(-3000); + factPersonScheme.SurvivalStats[0].MaxValue.Should().Be(150); + factPersonScheme.SurvivalStats[0].StartValue.Should().Be(50); + + var expectedKeyPoints = new[] { + new TestPersonSurvivalStatKeyPointSubScheme{ + Level = PersonSurvivalStatKeypointLevel.Lesser, + Value = -60 + }, + new TestPersonSurvivalStatKeyPointSubScheme{ + Level = PersonSurvivalStatKeypointLevel.Strong, + Value = -360 + }, + new TestPersonSurvivalStatKeyPointSubScheme{ + Level = PersonSurvivalStatKeypointLevel.Max, + Value = -2520 + }, + }; + factPersonScheme.SurvivalStats[0].KeyPoints.Should().BeEquivalentTo(expectedKeyPoints); + } + } +} diff --git a/Zilon.Core/Zilon.Core.Tests/Schemes/human-person.json b/Zilon.Core/Zilon.Core.Tests/Schemes/human-person.json new file mode 100644 index 000000000..58573bd68 --- /dev/null +++ b/Zilon.Core/Zilon.Core.Tests/Schemes/human-person.json @@ -0,0 +1,52 @@ +{ + "Name": { + "Ru": "Персонаж игрока" + }, + "Hp": 10, + "DefaultAct": "hand-hit", + "Slots": [ + { + "Types": "Head" + }, + { + "Types": "Body" + }, + { + "Types": "Hand" + }, + { + "Types": "Hand" + }, + { + "Types": "Aux" + }, + { + "Types": "Aux" + }, + { + "Types": "Aux" + } + ], + "SurvivalStats": [ + { + "Type": "Satiety", + "MinValue": -3000, + "MaxValue": 150, + "StartValue": 50, + "KeyPoints": [ + { + "Level": "Lesser", + "Value": -60 + }, + { + "Level": "Strong", + "Value": -360 + }, + { + "Level": "Max", + "Value": -2520 + } + ] + } + ] +} \ No newline at end of file diff --git a/Zilon.Core/Zilon.Core.Tests/Zilon.Core.Tests.csproj b/Zilon.Core/Zilon.Core.Tests/Zilon.Core.Tests.csproj index 15694a118..cf0e0eccf 100644 --- a/Zilon.Core/Zilon.Core.Tests/Zilon.Core.Tests.csproj +++ b/Zilon.Core/Zilon.Core.Tests/Zilon.Core.Tests.csproj @@ -122,11 +122,13 @@ + + @@ -135,6 +137,7 @@ + @@ -172,6 +175,7 @@ + diff --git a/Zilon.Core/Zilon.Core/Common/PropMetrics.cs b/Zilon.Core/Zilon.Core/Common/PropMetrics.cs index b24bf14eb..3e66c640e 100644 --- a/Zilon.Core/Zilon.Core/Common/PropMetrics.cs +++ b/Zilon.Core/Zilon.Core/Common/PropMetrics.cs @@ -9,5 +9,9 @@ public static class PropMetrics public const int HpLesserRestoreValue = 1; public const int HpNormalRestoreValue = 4; public const int HpGrandRestoreValue = 9; + + public const int INTOXICATION_RISE_LESSER_VALUE = 25; + public const int INTOXICATION_RISE_NORMAL_VALUE = 55; + public const int INTOXICATION_RISE_GRAND_VALUE = 120; } } diff --git a/Zilon.Core/Zilon.Core/Persons/Auxiliary/PersonEffectHelper.cs b/Zilon.Core/Zilon.Core/Persons/Auxiliary/PersonEffectHelper.cs index feb4d6b0b..79ae7a65c 100644 --- a/Zilon.Core/Zilon.Core/Persons/Auxiliary/PersonEffectHelper.cs +++ b/Zilon.Core/Zilon.Core/Persons/Auxiliary/PersonEffectHelper.cs @@ -18,12 +18,13 @@ public static class PersonEffectHelper /// /// Текущий список эффектов. /// Характеристика, на которую влияет эффект. - /// Ключевые точки, которые учавствуют в изменении характеристик. + /// Ключевые точки, которые учавствуют в изменении характеристик. + /// Передаются ключевые точки в порядке их прохождения. /// Источник рандома выживания. public static void UpdateSurvivalEffect( [NotNull] EffectCollection currentEffects, [NotNull] SurvivalStat stat, - [NotNull] [ItemNotNull] IEnumerable keyPoints, + [NotNull] [ItemNotNull] SurvivalStatKeyPoint[] keyPoints, [NotNull] ISurvivalRandomSource survivalRandomSource) { CheckArguments(currentEffects, stat, keyPoints, survivalRandomSource); @@ -31,12 +32,24 @@ public static void UpdateSurvivalEffect( var statType = stat.Type; var currentTypeEffect = GetCurrentEffect(currentEffects, statType); + // Эффект выставляем на основе последней проёденной ключевой точки. + // Потому что сюда передаются ключевые точки в порядке их прохождения. var keyPoint = keyPoints.Last(); if (currentTypeEffect != null) { // Эффект уже существует. Изменим его уровень. - if (stat.Value <= keyPoint.Value) + + // ! Костыль. Нужно переделать на отрезки вместо ключевых точек. + // Так мы определяем поведение в зависимости от характеристики. + // По сути, для сытости и упитости будем использовать старый алгоритм (чем ниже значение, тем выше уровень угрозы). + // А для интоксикации, наоборот, чем выше значение. + // Это возможно, потому что сейчас все ключевые точки расположены либо слева лиюо справа от нуля. + // Дальше нужно будет переделать на отрезки, когда будут как положительные, так и отрицательные ключевые точки. + // Это произойдёт, когда будет введено, например, обжорство. Ключевая точка, когда персонаж употребил слишком много еды. + var upRise = keyPoint.Value <= 0 ? stat.Value <= keyPoint.Value : stat.Value >= keyPoint.Value; + + if (upRise) { currentTypeEffect.Level = keyPoint.Level; } @@ -59,13 +72,11 @@ public static void UpdateSurvivalEffect( break; case SurvivalStatHazardLevel.Undefined: - throw new NotSupportedException(); - case SurvivalStatHazardLevel.Lesser: - throw new NotSupportedException(); - default: - throw new InvalidOperationException("Уровень эффекта, который не обрабатывается."); + // Для Lesser уже выполняется обработка выше. + // Для остальных уровней - в отдельных блоках case. + throw new NotSupportedException("Уровень эффекта, который не обрабатывается."); } } } diff --git a/Zilon.Core/Zilon.Core/Persons/HumanSurvivalData.cs b/Zilon.Core/Zilon.Core/Persons/HumanSurvivalData.cs index 25237d5a2..40784fb64 100644 --- a/Zilon.Core/Zilon.Core/Persons/HumanSurvivalData.cs +++ b/Zilon.Core/Zilon.Core/Persons/HumanSurvivalData.cs @@ -13,33 +13,61 @@ namespace Zilon.Core.Persons /// public sealed class HumanSurvivalData : ISurvivalData { - private const int START_SURVIVAL_STAT = 150; - private const int MIN_SURVIVAL_STAT = -150; - private const int MAX_SURVIVAL_STAT = 300; - private const int MAX_SURVIVAL_STAT_KEYPOINT = -100; - private const int STRONG_SURVIVAL_STAT_KEYPOINT = -50; - private const int LESSER_SURVIVAL_STAT_KEYPOINT = 0; - private readonly IPersonScheme _personScheme; private readonly ISurvivalRandomSource _randomSource; - private readonly Dictionary _modifiedStatPass; - public HumanSurvivalData([NotNull] IPersonScheme personScheme, [NotNull] ISurvivalRandomSource randomSource) { _personScheme = personScheme ?? throw new ArgumentNullException(nameof(personScheme)); _randomSource = randomSource ?? throw new ArgumentNullException(nameof(randomSource)); - Stats = new[] { - new SurvivalStat(_personScheme.Hp, 0, _personScheme.Hp){ - Type = SurvivalStatType.Health - }, - CreateStat(SurvivalStatType.Satiety), - CreateStat(SurvivalStatType.Water) + // Устанавливаем характеристики выживания персонажа + var statList = new List(); + SetHitPointsStat(_personScheme, statList); + + // Выставляем сытость/упоённость + if (personScheme.SurvivalStats != null) + { + CreateStatFromScheme(personScheme.SurvivalStats, + SurvivalStatType.Satiety, + PersonSurvivalStatType.Satiety, + statList); + + CreateStatFromScheme(personScheme.SurvivalStats, + SurvivalStatType.Hydration, + PersonSurvivalStatType.Hydration, + statList); + + CreateStatFromScheme(personScheme.SurvivalStats, + SurvivalStatType.Intoxication, + PersonSurvivalStatType.Intoxication, + statList); + } + + Stats = statList.ToArray(); + } + + private static void CreateStatFromScheme(IPersonSurvivalStatSubScheme[] survivalStats, + SurvivalStatType statType, + PersonSurvivalStatType schemeStatType, + List statList) + { + var stat = CreateStat(statType, schemeStatType, survivalStats); + if (stat != null) + { + statList.Add(stat); + } + } + + private static void SetHitPointsStat(IPersonScheme personScheme, IList statList) + { + var hpStat = new SurvivalStat(personScheme.Hp, 0, personScheme.Hp) + { + Type = SurvivalStatType.Health }; - _modifiedStatPass = new Dictionary(); + statList.Add(hpStat); } public HumanSurvivalData([NotNull] IPersonScheme personScheme, @@ -188,22 +216,56 @@ private void DoDead() Dead?.Invoke(this, new EventArgs()); } - private static SurvivalStat CreateStat(SurvivalStatType type) + private static SurvivalStat CreateStat(SurvivalStatType type, PersonSurvivalStatType schemeStatType, IPersonSurvivalStatSubScheme[] survivalStats) { - var stat = new SurvivalStat(START_SURVIVAL_STAT, MIN_SURVIVAL_STAT, MAX_SURVIVAL_STAT) + var statScheme = survivalStats.SingleOrDefault(x => x.Type == schemeStatType); + if (statScheme == null) + { + return null; + } + + var keyPointList = new List(); + if (statScheme.KeyPoints != null) + { + AddKeyPoint(SurvivalStatHazardLevel.Max, PersonSurvivalStatKeypointLevel.Max, statScheme.KeyPoints, keyPointList); + AddKeyPoint(SurvivalStatHazardLevel.Strong, PersonSurvivalStatKeypointLevel.Strong, statScheme.KeyPoints, keyPointList); + AddKeyPoint(SurvivalStatHazardLevel.Lesser, PersonSurvivalStatKeypointLevel.Lesser, statScheme.KeyPoints, keyPointList); + + //Ниже пока не актуально. Алгоритм работает так, что ему не важен порядок ключевых точек. + //// По условиям работы с о схемами, в схемах ключевые значения + //// могут быть в любом порядке. + //// При создании ключевых точек их нужно сортировать по возрастанию, чтобы корректно + //// обрабатываться пересечение ключевых точек. + //keyPointList.Sort((a, b) => a.Value.CompareTo(b.Value)); + } + + var stat = new SurvivalStat(statScheme.StartValue, statScheme.MinValue, statScheme.MaxValue) { Type = type, Rate = 1, - KeyPoints = new[]{ - new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Max, MAX_SURVIVAL_STAT_KEYPOINT), - new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Strong, STRONG_SURVIVAL_STAT_KEYPOINT), - new SurvivalStatKeyPoint(SurvivalStatHazardLevel.Lesser, LESSER_SURVIVAL_STAT_KEYPOINT) - } + KeyPoints = keyPointList.ToArray() }; + return stat; } - private void DoStatCrossKeyPoint(SurvivalStat stat, IEnumerable keyPoints) + private static void AddKeyPoint( + SurvivalStatHazardLevel max1, + PersonSurvivalStatKeypointLevel max2, + IPersonSurvivalStatKeyPointSubScheme[] keyPoints, + List keyPointList) + { + var schemeKeyPoint = GetKeyPointSchemeValue(max2, keyPoints); + if (schemeKeyPoint == null) + { + return; + } + + var keyPoint = new SurvivalStatKeyPoint(max1, schemeKeyPoint.Value); + keyPointList.Add(keyPoint); + } + + private void DoStatCrossKeyPoint(SurvivalStat stat, SurvivalStatKeyPoint[] keyPoints) { var args = new SurvivalStatChangedEventArgs(stat, keyPoints); StatCrossKeyValue?.Invoke(this, args); @@ -225,5 +287,10 @@ public void ResetStats() stat.DownPassRoll = SurvivalStat.DEFAULT_DOWN_PASS_VALUE; } } + + private static int? GetKeyPointSchemeValue(PersonSurvivalStatKeypointLevel level, IPersonSurvivalStatKeyPointSubScheme[] keyPoints) + { + return keyPoints.SingleOrDefault(x => x.Level == level)?.Value; + } } } diff --git a/Zilon.Core/Zilon.Core/Persons/ISurvivalDataExtensions.cs b/Zilon.Core/Zilon.Core/Persons/ISurvivalDataExtensions.cs index bab3f8c02..dcadae418 100644 --- a/Zilon.Core/Zilon.Core/Persons/ISurvivalDataExtensions.cs +++ b/Zilon.Core/Zilon.Core/Persons/ISurvivalDataExtensions.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using Zilon.Core.Common; @@ -14,30 +15,58 @@ public static class ISurvivalDataExtensions /// Набор ключевых точек. /// The left value. /// The right value. - /// Возвращает набор точек, значения которых попадает в указанный диапазон. - public static IEnumerable CalcKeyPointsInRange( + /// Возвращает набор точек, значения которых попадает в указанный диапазон. + /// Точки возвращаются в том порядке, в котором пересекаются, если двигаться от левого значения к правому. + public static SurvivalStatKeyPoint[] CalcKeyPointsInRange( this SurvivalStatKeyPoint[] keyPoints, int leftValue, int rightValue) { - var diff = RangeHelper.CreateNormalized(leftValue, rightValue); - - var orientedKeyPoints = keyPoints; - if (!diff.IsAcs) + if (leftValue == rightValue) { - orientedKeyPoints = keyPoints.Reverse().ToArray(); + return new SurvivalStatKeyPoint[0]; } var crossedKeyPoints = new List(); - foreach (var keyPoint in orientedKeyPoints) + var step = leftValue < rightValue ? 1 : -1; + var steps = Math.Abs(leftValue - rightValue) + 1; + var stepCounter = 0; + + var currentValue = leftValue; + do { - if (diff.Contains(keyPoint.Value)) + foreach (var keyPoint in keyPoints) { - crossedKeyPoints.Add(keyPoint); + if (keyPoint.Value == currentValue) + { + crossedKeyPoints.Add(keyPoint); + } } - } - return crossedKeyPoints; + currentValue += step; + stepCounter++; + } while (stepCounter< steps); + + return crossedKeyPoints.ToArray(); + + //var diff = RangeHelper.CreateNormalized(leftValue, rightValue); + + //var orientedKeyPoints = keyPoints; + //if (!diff.IsAcs) + //{ + // orientedKeyPoints = keyPoints.Reverse().ToArray(); + //} + + //var crossedKeyPoints = new List(); + //foreach (var keyPoint in orientedKeyPoints) + //{ + // if (diff.Contains(keyPoint.Value)) + // { + // crossedKeyPoints.Add(keyPoint); + // } + //} + + //return crossedKeyPoints; } } } diff --git a/Zilon.Core/Zilon.Core/Persons/RandomHumanPersonFactory.cs b/Zilon.Core/Zilon.Core/Persons/RandomHumanPersonFactory.cs index b704daacc..454f9403f 100644 --- a/Zilon.Core/Zilon.Core/Persons/RandomHumanPersonFactory.cs +++ b/Zilon.Core/Zilon.Core/Persons/RandomHumanPersonFactory.cs @@ -70,9 +70,17 @@ public HumanPerson Create() AddResource(inventory, "water-bottle", 1); AddResource(inventory, "med-kit", 1); + return person; } + private void AddEquipment(Inventory inventory, string sid) + { + var scheme = _schemeService.GetScheme(sid); + var prop = _propFactory.CreateEquipment(scheme); + AddPropToInventory(inventory, prop); + } + private void FillSlot(HumanPerson person, IDropTableScheme dropScheme, int slotIndex) { // Генерируем предметы. diff --git a/Zilon.Core/Zilon.Core/Persons/SurvivalStat.cs b/Zilon.Core/Zilon.Core/Persons/SurvivalStat.cs index f39444652..5a6cbc057 100644 --- a/Zilon.Core/Zilon.Core/Persons/SurvivalStat.cs +++ b/Zilon.Core/Zilon.Core/Persons/SurvivalStat.cs @@ -7,6 +7,10 @@ namespace Zilon.Core.Persons /// public sealed class SurvivalStat: Stat { + /// + /// Значение броска по умолчанию для снижения характеристики. + /// Нужно выбросить столько или больше, чтобы характеристика не снижалась. + /// public const int DEFAULT_DOWN_PASS_VALUE = 4; /// @@ -36,7 +40,11 @@ public SurvivalStat(int startValue, int min, int max): base(startValue, min, max /// public int DownPassRoll { get; set; } - /// Набор ключевых точек характеристики. + /// Набор ключевых точек характеристики. + /// Внимание! + /// Сейчас все ключевые чтоки должны быть либо слева от нуля включая ноль. + /// Либо справа от нуля. + /// public SurvivalStatKeyPoint[] KeyPoints { get; set; } } } diff --git a/Zilon.Core/Zilon.Core/Persons/SurvivalStatChangedEventArgs.cs b/Zilon.Core/Zilon.Core/Persons/SurvivalStatChangedEventArgs.cs index 79def3b79..5e0cf9e48 100644 --- a/Zilon.Core/Zilon.Core/Persons/SurvivalStatChangedEventArgs.cs +++ b/Zilon.Core/Zilon.Core/Persons/SurvivalStatChangedEventArgs.cs @@ -13,7 +13,7 @@ public class SurvivalStatChangedEventArgs : EventArgs { [ExcludeFromCodeCoverage] public SurvivalStatChangedEventArgs([NotNull] SurvivalStat stat, - [NotNull] [ItemNotNull] IEnumerable keyPoints) + [NotNull] [ItemNotNull] SurvivalStatKeyPoint[] keyPoints) { Stat = stat ?? throw new ArgumentNullException(nameof(stat)); KeyPoints = keyPoints ?? throw new ArgumentNullException(nameof(keyPoints)); @@ -27,6 +27,6 @@ public SurvivalStatChangedEventArgs([NotNull] SurvivalStat stat, /// /// Ключевые точки, которые были пересечены. /// - public IEnumerable KeyPoints { get; } + public SurvivalStatKeyPoint[] KeyPoints { get; } } } diff --git a/Zilon.Core/Zilon.Core/Persons/SurvivalStatType.cs b/Zilon.Core/Zilon.Core/Persons/SurvivalStatType.cs index 3e1acf37f..44d604779 100644 --- a/Zilon.Core/Zilon.Core/Persons/SurvivalStatType.cs +++ b/Zilon.Core/Zilon.Core/Persons/SurvivalStatType.cs @@ -6,7 +6,7 @@ public enum SurvivalStatType { /// - /// Не определена. + /// Не определена. Скорее всего, ошибка. /// Undefined, @@ -21,8 +21,13 @@ public enum SurvivalStatType Satiety, /// - /// Достаточность воды. + /// Достаточность воды. Напоенность, упитость. /// - Water + Hydration, + + /// + /// Интоксикация персонажа. + /// + Intoxication } } diff --git a/Zilon.Core/Zilon.Core/Schemes/ConsumeCommonRuleType.cs b/Zilon.Core/Zilon.Core/Schemes/ConsumeCommonRuleType.cs index 35831c73b..39fcd6061 100644 --- a/Zilon.Core/Zilon.Core/Schemes/ConsumeCommonRuleType.cs +++ b/Zilon.Core/Zilon.Core/Schemes/ConsumeCommonRuleType.cs @@ -20,6 +20,11 @@ public enum ConsumeCommonRuleType /// /// Влияет на здоровье. /// - Health + Health, + + /// + /// Влияние на уровень интоксикации персонажа. + /// + Intoxication } } diff --git a/Zilon.Core/Zilon.Core/Schemes/IPersonScheme.cs b/Zilon.Core/Zilon.Core/Schemes/IPersonScheme.cs index 7ec61b0eb..2083c715e 100644 --- a/Zilon.Core/Zilon.Core/Schemes/IPersonScheme.cs +++ b/Zilon.Core/Zilon.Core/Schemes/IPersonScheme.cs @@ -2,6 +2,10 @@ namespace Zilon.Core.Schemes { + /// + /// Схема персонажа. + /// Это может быть персонаж игрока или напарник. Но не НПС и не монстр. + /// public interface IPersonScheme: IScheme { [NotNull] @@ -11,5 +15,12 @@ public interface IPersonScheme: IScheme [NotNull, ItemNotNull] PersonSlotSubScheme[] Slots { get; set; } + + /// + /// Характеристики выживания персонажа. + /// Такие, как запас сытости/гидратации. + /// + [NotNull] + IPersonSurvivalStatSubScheme[] SurvivalStats { get; } } } \ No newline at end of file diff --git a/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatKeyPointSubScheme.cs b/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatKeyPointSubScheme.cs new file mode 100644 index 000000000..9877be940 --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatKeyPointSubScheme.cs @@ -0,0 +1,22 @@ +namespace Zilon.Core.Schemes +{ + /// + /// Подсхема для описания ключевых точек какой-либо характеристики выживания. + /// Ключевые точки в схеме могут располагаться в произвольном порядке. + /// При чтении в рабочую модель они будут упорядочены, как нужно модели. + /// + public interface IPersonSurvivalStatKeyPointSubScheme + { + /// + /// Уровень ключевой точки. + /// + PersonSurvivalStatKeypointLevel Level { get; } + + /// + /// Значение ключевой точки. + /// В зависимости от стороны прохождения значения ключевой точки + /// обычно уровень угрозы выживания либо повышается, либо понижается. + /// + int Value { get; } + } +} diff --git a/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatSubScheme.cs b/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatSubScheme.cs new file mode 100644 index 000000000..02bc2c75a --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/IPersonSurvivalStatSubScheme.cs @@ -0,0 +1,41 @@ +namespace Zilon.Core.Schemes +{ + /// + /// Подсхема характеристики выживания персонажа. + /// + public interface IPersonSurvivalStatSubScheme: ISubScheme + { + /// + /// Тип характеристики выживания. Сытость/гидратация. + /// На будущее будет усталость, уровень перегрева, переохлаждения, + /// отравления, токсикации, облучения, коррапта, дыхание. + /// + PersonSurvivalStatType Type { get; } + + /// + /// Ключевые точки характеристики. + /// При прохождении ключевых точек будет выбрасываться событие. + /// В результате прохождения ключевых точек обычно наступают или сбрасываются угрозы выживания. + /// Например, добавляется эффект голода, снижающего характеристики. + /// + IPersonSurvivalStatKeyPointSubScheme[] KeyPoints { get; } + + /// + /// Стартовое значение характеристики. + /// Это опорное, начальное значение характеристики при создании персонажа. + /// + int StartValue { get; } + + /// + /// Минимальное значение характеристики. + /// Ниже этого значения характеристика не будет опускаться. + /// + int MinValue { get; } + + /// + /// Максимальное значение характеристики. + /// Выше этого значения характеристика не будет подниматься. + /// + int MaxValue { get; } + } +} diff --git a/Zilon.Core/Zilon.Core/Schemes/PersonScheme.cs b/Zilon.Core/Zilon.Core/Schemes/PersonScheme.cs index f018e0de8..0921be6db 100644 --- a/Zilon.Core/Zilon.Core/Schemes/PersonScheme.cs +++ b/Zilon.Core/Zilon.Core/Schemes/PersonScheme.cs @@ -1,4 +1,5 @@ using JetBrains.Annotations; +using Newtonsoft.Json; namespace Zilon.Core.Schemes { @@ -23,5 +24,14 @@ public class PersonScheme : SchemeBase, IPersonScheme /// [UsedImplicitly] public PersonSlotSubScheme[] Slots { get; set; } + + /// + /// Характеристики выживания персонажа. + /// Такие, как запас сытости/гидратации. + /// + [JsonConverter(typeof(ConcreteTypeConverter))] + [JsonProperty] + [UsedImplicitly] + public IPersonSurvivalStatSubScheme[] SurvivalStats { get; private set; } } } diff --git a/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeyPointSubScheme.cs b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeyPointSubScheme.cs new file mode 100644 index 000000000..49e1cdc14 --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeyPointSubScheme.cs @@ -0,0 +1,16 @@ +using Newtonsoft.Json; + +namespace Zilon.Core.Schemes +{ + /// + /// Базовая реализация подсхемы ключевой точки характеристики выживания. + /// + public sealed class PersonSurvivalStatKeyPointSubScheme : IPersonSurvivalStatKeyPointSubScheme + { + [JsonProperty] + public PersonSurvivalStatKeypointLevel Level { get; private set; } + + [JsonProperty] + public int Value { get; private set; } + } +} diff --git a/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeypointLevel.cs b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeypointLevel.cs new file mode 100644 index 000000000..e3bddbcf6 --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatKeypointLevel.cs @@ -0,0 +1,34 @@ +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; + +namespace Zilon.Core.Schemes +{ + /// + /// Уровень ключевой точки в характеристиках выживания. + /// Обычно, тем выше уровень, тем хуже персонажу, больше штрафы. + /// Служит только для загрузки схемы из json. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum PersonSurvivalStatKeypointLevel + { + /// + /// Не определено. Скорее всего ошибка при десериализации или при создании. + /// + Undefined = 0, + + /// + /// Слабая нужда в чём-либо. + /// + Lesser, + + /// + /// Сильная нужда в чём-либо. + /// + Strong, + + /// + /// Критический уровнь нужны в чём-либо. + /// + Max + } +} diff --git a/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatSubScheme.cs b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatSubScheme.cs new file mode 100644 index 000000000..5613981a6 --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatSubScheme.cs @@ -0,0 +1,26 @@ +using Newtonsoft.Json; + +namespace Zilon.Core.Schemes +{ + /// + /// Базовая реализация подсхемы характеристики выживания персонажа. + /// + public sealed class PersonSurvivalStatSubScheme : SubSchemeBase, IPersonSurvivalStatSubScheme + { + [JsonProperty] + public PersonSurvivalStatType Type { get; private set; } + + [JsonProperty] + [JsonConverter(typeof(ConcreteTypeConverter))] + public IPersonSurvivalStatKeyPointSubScheme[] KeyPoints { get; private set; } + + [JsonProperty] + public int StartValue { get; private set; } + + [JsonProperty] + public int MinValue { get; private set; } + + [JsonProperty] + public int MaxValue { get; private set; } + } +} diff --git a/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatType.cs b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatType.cs new file mode 100644 index 000000000..f56d94ccf --- /dev/null +++ b/Zilon.Core/Zilon.Core/Schemes/PersonSurvivalStatType.cs @@ -0,0 +1,33 @@ +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; + +namespace Zilon.Core.Schemes +{ + /// + /// Перечисление характеристик выживания для персонажа. + /// Служит только для загрузки схемы из json. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum PersonSurvivalStatType + { + /// + /// Не определена. Скорее всего, ошибка. + /// + Undefined, + + /// + /// Сытость. + /// + Satiety, + + /// + /// Достаточность воды. + /// + Hydration, + + /// + /// Интоксикация персонажа. + /// + Intoxication + } +} diff --git a/Zilon.Core/Zilon.Core/Scoring/TextSummaryHelper.cs b/Zilon.Core/Zilon.Core/Scoring/TextSummaryHelper.cs new file mode 100644 index 000000000..1c97b1e0b --- /dev/null +++ b/Zilon.Core/Zilon.Core/Scoring/TextSummaryHelper.cs @@ -0,0 +1,53 @@ +using System.Text; + +using Zilon.Core.Tactics; + +namespace Zilon.Core.Scoring +{ + /// + /// Вспомогательный класс для работы текстовым представлением итогов игры. + /// + public static class TextSummaryHelper + { + /// + /// Создать текстовое описание итогов игры. + /// + /// Объект, содержащий очки игры. + /// Возвращает текстовое представление итогов игры в виде строки. + public static string CreateTextSummary(Scores scores) + { + var summaryStringBuilder = new StringBuilder(); + + summaryStringBuilder.AppendLine("YOU (BOT) DIED"); + + summaryStringBuilder.AppendLine($"SCORES: {scores.BaseScores}"); + + summaryStringBuilder.AppendLine("=== You survived ==="); + var minutesTotal = scores.Turns * 2; + var hoursTotal = minutesTotal / 60f; + var daysTotal = hoursTotal / 24f; + var days = (int)daysTotal; + var hours = (int)(hoursTotal - days * 24); + + summaryStringBuilder.AppendLine($"{days} days {hours} hours"); + summaryStringBuilder.AppendLine($"Turns: {scores.Turns}"); + + summaryStringBuilder.AppendLine("=== You visited ==="); + + summaryStringBuilder.AppendLine($"{scores.Places.Count} places"); + + foreach (var placeType in scores.PlaceTypes) + { + summaryStringBuilder.AppendLine($"{placeType.Key.Name?.En ?? placeType.Key.Name?.Ru ?? placeType.Key.ToString()}: {placeType.Value} turns"); + } + + summaryStringBuilder.AppendLine("=== You killed ==="); + foreach (var frag in scores.Frags) + { + summaryStringBuilder.AppendLine($"{frag.Key.Name?.En ?? frag.Key.Name?.Ru ?? frag.Key.ToString()}: {frag.Value}"); + } + + return summaryStringBuilder.ToString(); + } + } +} diff --git a/Zilon.Core/Zilon.Core/Tactics/Actor.cs b/Zilon.Core/Zilon.Core/Tactics/Actor.cs index fb99f5404..e0c68f478 100644 --- a/Zilon.Core/Zilon.Core/Tactics/Actor.cs +++ b/Zilon.Core/Zilon.Core/Tactics/Actor.cs @@ -93,13 +93,17 @@ public void UseProp(IProp usedProp) break; case ConsumeCommonRuleType.Thirst: - RestoreStat(SurvivalStatType.Water, rule.Level); + RestoreStat(SurvivalStatType.Hydration, rule.Level); break; case ConsumeCommonRuleType.Health: RestoreStat(SurvivalStatType.Health, rule.Level); break; + case ConsumeCommonRuleType.Intoxication: + RiseStat(SurvivalStatType.Intoxication, rule.Level); + break; + case ConsumeCommonRuleType.Undefined: default: throw new ArgumentOutOfRangeException($"Правило поглощения {rule.Type} не поддерживается."); @@ -113,7 +117,7 @@ public void UseProp(IProp usedProp) break; case ConsumeCommonRuleType.Thirst: - DecreaseStat(SurvivalStatType.Water, rule.Level); + DecreaseStat(SurvivalStatType.Hydration, rule.Level); break; case ConsumeCommonRuleType.Health: @@ -195,6 +199,18 @@ public override string ToString() return $"{Person}"; } + /// + /// Метод введён специально для повышения уровня интоксикации. + /// Так как глупо выглядит ResToreStat для повышения интоксикации. + /// Просто семантически более удобная обёртка. + /// + /// Характеристика, повышаемая методом. + /// Уровень увеличения. + private void RiseStat(SurvivalStatType statType, PersonRuleLevel level) + { + RestoreStat(statType, level); + } + private void RestoreStat(SurvivalStatType statType, PersonRuleLevel level) { switch (statType) @@ -203,8 +219,12 @@ private void RestoreStat(SurvivalStatType statType, PersonRuleLevel level) RestoreSurvivalStatInner(SurvivalStatType.Satiety, level); break; - case SurvivalStatType.Water: - RestoreSurvivalStatInner(SurvivalStatType.Water, level); + case SurvivalStatType.Hydration: + RestoreSurvivalStatInner(SurvivalStatType.Hydration, level); + break; + + case SurvivalStatType.Intoxication: + RiseIntoxicationLevel(level); break; case SurvivalStatType.Health: @@ -267,6 +287,30 @@ private void RestoreHp(PersonRuleLevel level) } } + private void RiseIntoxicationLevel(PersonRuleLevel level) + { + switch (level) + { + case PersonRuleLevel.Lesser: + Person.Survival?.RestoreStat(SurvivalStatType.Intoxication, + PropMetrics.INTOXICATION_RISE_LESSER_VALUE + 1); + break; + + case PersonRuleLevel.Normal: + Person.Survival?.RestoreStat(SurvivalStatType.Intoxication, + PropMetrics.INTOXICATION_RISE_NORMAL_VALUE + 1); + break; + + case PersonRuleLevel.Grand: + Person.Survival?.RestoreStat(SurvivalStatType.Intoxication, + PropMetrics.INTOXICATION_RISE_GRAND_VALUE + 1); + break; + + default: + throw new InvalidOperationException($"Неизвестный уровень влияния правила {level}."); + } + } + private void DecreaseStat(SurvivalStatType statType, PersonRuleLevel level) { switch (statType) @@ -275,8 +319,8 @@ private void DecreaseStat(SurvivalStatType statType, PersonRuleLevel level) DecreaseSurvivalStatInner(SurvivalStatType.Satiety, level); break; - case SurvivalStatType.Water: - DecreaseSurvivalStatInner(SurvivalStatType.Water, level); + case SurvivalStatType.Hydration: + DecreaseSurvivalStatInner(SurvivalStatType.Hydration, level); break; case SurvivalStatType.Health: diff --git a/Zilon.Core/Zilon.Core/Zilon.Core.csproj b/Zilon.Core/Zilon.Core/Zilon.Core.csproj index f1a200ecc..6599b9c6c 100644 --- a/Zilon.Core/Zilon.Core/Zilon.Core.csproj +++ b/Zilon.Core/Zilon.Core/Zilon.Core.csproj @@ -159,16 +159,23 @@ + + + + + + +