Danil Iarosh
cb2e83a596
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
- доработан flow призовой витрины и связанного UI: добавлены `PrizeStandButtonView` и `RulesPrizeListPage`, обновлены `PrizeStandController`, `PrizeStandPrize`, `PrizeStandModal`, `PrizeStandSettingsModal`, `LevelPrizeSettingsModal`, `QRCodeSettingsModal`, `BalanceDisplay`, `ButtonTextFocusColor` и связанные prefab'ы, чтобы улучшить настройку, навигацию, отображение кнопок и prize flow - расширена система настроек и сохранения значений: `OptionPicker` получил отдельный формат `ValueSelector`, обновлены `SettingsDatabase`, `SettingEntryDrawer`, `SettingUIItem`, `SettingsUIGenerator`, `ValueSelectorRow` и `MainSettingsDatabase.asset`, а сохранение option picker-значений, включая `gameplay.gameDifficulty`, исправлено и синхронизировано с остальными настройками - добавлены универсальные спавнеры сущностей: реализованы `EntitySpawner` и `EntitySpawnerManager` с поддержкой весов префабов, точек спавна, заполнения по проценту, ограничений на количество и автоспавна при инициализации - доработана логика игрового спавна и сложности: процент инициализационного спавна может зависеть от настройки `gameplay.gameDifficulty` с градациями 25/50/75/100, в одном цикле массового спавна повторно не используется та же точка, а gizmo спавнера теперь показывает только сами точки без линий - упрощена работа в редакторе Unity и добавлены editor-инструменты: в `GameManager` лицензия пропускается при запуске в `UNITY_EDITOR`, а `HierarchySelectionCounter`, `HierarchySelectionCountOverlay` и `HierarchyBulkRenamerWindow` добавляют подсчет выделения, realtime overlay в `SceneView` и массовое переименование объектов по правилам нумерации из Unity Project Settings - синхронизированы сцены, ресурсы и UI-ассеты под новый flow: обновлены `MainMenu`, `Level UI`, уровни `1-1` и `1-2`, строки настроек, кнопки, TMP/font assets, изображения UI, `prizes.json` и recovery-данные после правок интерфейса и логики - очищены и переразложены часть внешних и служебных ресурсов: удалён пакет `Lava_Flowing_Shader`, переименованы/заменены отдельные UI-prefab'ы и добавлены сопутствующие проектные артефакты, которые сейчас используются обновлённой конфигурацией проекта
351 lines
10 KiB
Plaintext
351 lines
10 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1 &1758083603916175787
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 7082477975537308933}
|
|
- component: {fileID: 6418208233271057322}
|
|
- component: {fileID: 226186850308132312}
|
|
- component: {fileID: 6489304585556535039}
|
|
m_Layer: 0
|
|
m_Name: Row_Button
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!224 &7082477975537308933
|
|
RectTransform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1758083603916175787}
|
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
m_ConstrainProportionsScale: 0
|
|
m_Children:
|
|
- {fileID: 4651342010868548259}
|
|
m_Father: {fileID: 0}
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
m_AnchoredPosition: {x: 0, y: 0}
|
|
m_SizeDelta: {x: 400, y: 70}
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
--- !u!222 &6418208233271057322
|
|
CanvasRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1758083603916175787}
|
|
m_CullTransparentMesh: 1
|
|
--- !u!114 &226186850308132312
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1758083603916175787}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
|
|
m_IgnoreLayout: 0
|
|
m_MinWidth: -1
|
|
m_MinHeight: -1
|
|
m_PreferredWidth: 400
|
|
m_PreferredHeight: 70
|
|
m_FlexibleWidth: -1
|
|
m_FlexibleHeight: -1
|
|
m_LayoutPriority: 1
|
|
--- !u!114 &6489304585556535039
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 1758083603916175787}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 4c856f3cf51e81642a471d0300e1cdea, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier: Assembly-CSharp::RR.Common.UI.SettingUIItem
|
|
titleText: {fileID: 2985328858931436486}
|
|
descriptionText: {fileID: 0}
|
|
toggle: {fileID: 0}
|
|
slider: {fileID: 0}
|
|
dropdown: {fileID: 0}
|
|
input: {fileID: 0}
|
|
button: {fileID: 7403115420713256969}
|
|
prevButton: {fileID: 0}
|
|
nextButton: {fileID: 0}
|
|
optionValueText: {fileID: 0}
|
|
sliderValueText: {fileID: 0}
|
|
--- !u!1 &2307937535396352836
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 7969020585539137307}
|
|
- component: {fileID: 2544164544592874034}
|
|
- component: {fileID: 2985328858931436486}
|
|
m_Layer: 0
|
|
m_Name: Title
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!224 &7969020585539137307
|
|
RectTransform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 2307937535396352836}
|
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
m_ConstrainProportionsScale: 0
|
|
m_Children: []
|
|
m_Father: {fileID: 4651342010868548259}
|
|
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: 2.5}
|
|
m_SizeDelta: {x: -56, y: -5}
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
--- !u!222 &2544164544592874034
|
|
CanvasRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 2307937535396352836}
|
|
m_CullTransparentMesh: 1
|
|
--- !u!114 &2985328858931436486
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 2307937535396352836}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Material: {fileID: 0}
|
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
m_RaycastTarget: 1
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
m_Maskable: 1
|
|
m_OnCullStateChanged:
|
|
m_PersistentCalls:
|
|
m_Calls: []
|
|
m_text: "\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A"
|
|
m_isRightToLeft: 0
|
|
m_fontAsset: {fileID: 11400000, guid: 7041394783e612f4eae9131c0a535951, type: 2}
|
|
m_sharedMaterial: {fileID: 818154761001154010, guid: 7041394783e612f4eae9131c0a535951, type: 2}
|
|
m_fontSharedMaterials: []
|
|
m_fontMaterial: {fileID: 0}
|
|
m_fontMaterials: []
|
|
m_fontColor32:
|
|
serializedVersion: 2
|
|
rgba: 4288954963
|
|
m_fontColor: {r: 0.3254902, g: 0.25882354, b: 0.6431373, a: 1}
|
|
m_enableVertexGradient: 0
|
|
m_colorMode: 3
|
|
m_fontColorGradient:
|
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
|
m_fontColorGradientPreset: {fileID: 0}
|
|
m_spriteAsset: {fileID: 0}
|
|
m_tintAllSprites: 0
|
|
m_StyleSheet: {fileID: 0}
|
|
m_TextStyleHashCode: -1183493901
|
|
m_overrideHtmlColors: 0
|
|
m_faceColor:
|
|
serializedVersion: 2
|
|
rgba: 4294967295
|
|
m_fontSize: 48
|
|
m_fontSizeBase: 48
|
|
m_fontWeight: 400
|
|
m_enableAutoSizing: 1
|
|
m_fontSizeMin: 18
|
|
m_fontSizeMax: 48
|
|
m_fontStyle: 1
|
|
m_HorizontalAlignment: 2
|
|
m_VerticalAlignment: 512
|
|
m_textAlignment: 65535
|
|
m_characterSpacing: 0
|
|
m_characterHorizontalScale: 1
|
|
m_wordSpacing: 0
|
|
m_lineSpacing: -40
|
|
m_lineSpacingMax: 0
|
|
m_paragraphSpacing: 0
|
|
m_charWidthMaxAdj: 0
|
|
m_TextWrappingMode: 1
|
|
m_wordWrappingRatios: 0.4
|
|
m_overflowMode: 0
|
|
m_linkedTextComponent: {fileID: 0}
|
|
parentLinkedComponent: {fileID: 0}
|
|
m_enableKerning: 0
|
|
m_ActiveFontFeatures: 6e72656b
|
|
m_enableExtraPadding: 0
|
|
checkPaddingRequired: 0
|
|
m_isRichText: 1
|
|
m_EmojiFallbackSupport: 1
|
|
m_parseCtrlCharacters: 1
|
|
m_isOrthographic: 1
|
|
m_isCullingEnabled: 0
|
|
m_horizontalMapping: 0
|
|
m_verticalMapping: 0
|
|
m_uvLineOffset: 0
|
|
m_geometrySortingOrder: 0
|
|
m_IsTextObjectScaleStatic: 0
|
|
m_VertexBufferAutoSizeReduction: 0
|
|
m_useMaxVisibleDescender: 1
|
|
m_pageToDisplay: 1
|
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
|
m_isUsingLegacyAnimationComponent: 0
|
|
m_isVolumetricText: 0
|
|
m_hasFontAssetChanged: 0
|
|
m_baseMaterial: {fileID: 0}
|
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
|
--- !u!1 &7033118707232536323
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 4651342010868548259}
|
|
- component: {fileID: 739767321169741777}
|
|
- component: {fileID: 4558843671109735324}
|
|
- component: {fileID: 7403115420713256969}
|
|
m_Layer: 0
|
|
m_Name: Button
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!224 &4651342010868548259
|
|
RectTransform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 7033118707232536323}
|
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
m_ConstrainProportionsScale: 0
|
|
m_Children:
|
|
- {fileID: 7969020585539137307}
|
|
m_Father: {fileID: 7082477975537308933}
|
|
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 &739767321169741777
|
|
CanvasRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 7033118707232536323}
|
|
m_CullTransparentMesh: 1
|
|
--- !u!114 &4558843671109735324
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 7033118707232536323}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Material: {fileID: 0}
|
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
m_RaycastTarget: 1
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
m_Maskable: 1
|
|
m_OnCullStateChanged:
|
|
m_PersistentCalls:
|
|
m_Calls: []
|
|
m_Sprite: {fileID: 941719080601148414, guid: ad2afac0a797cb24790e071edd921cb9, type: 3}
|
|
m_Type: 1
|
|
m_PreserveAspect: 0
|
|
m_FillCenter: 1
|
|
m_FillMethod: 4
|
|
m_FillAmount: 1
|
|
m_FillClockwise: 1
|
|
m_FillOrigin: 0
|
|
m_UseSpriteMesh: 0
|
|
m_PixelsPerUnitMultiplier: 2.5
|
|
--- !u!114 &7403115420713256969
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 7033118707232536323}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|
|
m_Navigation:
|
|
m_Mode: 3
|
|
m_WrapAround: 0
|
|
m_SelectOnUp: {fileID: 0}
|
|
m_SelectOnDown: {fileID: 0}
|
|
m_SelectOnLeft: {fileID: 0}
|
|
m_SelectOnRight: {fileID: 0}
|
|
m_Transition: 1
|
|
m_Colors:
|
|
m_NormalColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
|
|
m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
|
|
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
|
|
m_DisabledColor: {r: 0.63529414, g: 0.63529414, b: 0.63529414, 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: 4558843671109735324}
|
|
m_OnClick:
|
|
m_PersistentCalls:
|
|
m_Calls: []
|