Skip to content

Commit

Permalink
Исправил вызов метода ShowEnding, убрал UI локации с экрана концовки
Browse files Browse the repository at this point in the history
  • Loading branch information
@Torbell27
Torbell27 committed Dec 9, 2024
1 parent 5f602fa commit eeeab53
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 230 deletions.
190 changes: 7 additions & 183 deletions UnityProject/Assets/Scenes/BedroomScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -976,172 +976,6 @@ MonoBehaviour:
InventorySprite: {fileID: 21300000, guid: 1a58f5c0f2cb31d4d86f8cd64675378f, type: 3}
HighlightSprite: {fileID: 21300000, guid: f2b7bce8a9871a14399e3c77b3d31575, type: 3}
NoHighlightSprite: {fileID: 21300000, guid: 20d1471046c4a8c47a5a6797ccd4d3c3, type: 3}
--- !u!1 &795725992
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 795725995}
- component: {fileID: 795725994}
- component: {fileID: 795725993}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &795725993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 795725992}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 22
m_fontSizeBase: 22
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -465.8341, y: -283.784, z: -515.36237, w: -314.5718}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &795725994
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 795725992}
m_CullTransparentMesh: 1
--- !u!224 &795725995
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 795725992}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.4727402}
m_LocalScale: {x: 0.1388889, y: 0.1388889, z: 0.1388889}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 929270314}
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: -17.190876, y: -2.1322174}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &929270313
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 929270314}
m_Layer: 0
m_Name: EndingObj
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &929270314
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 929270313}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 101.218155, y: 29.739756, z: 3.4037292}
m_LocalScale: {x: 7.2, y: 7.2, z: 7.2}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 795725995}
m_Father: {fileID: 2924143437311501568}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &959063385
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1471,8 +1305,8 @@ MonoBehaviour:
EndingText:
MainTextFile: EndingTexts.csv
ItemsTextFile: EndingTextsForItems.csv
textB: {fileID: 929270313}
TextField: {fileID: 795725993}
textB: {fileID: 0}
TextField: {fileID: 0}
--- !u!4 &1816873678
Transform:
m_ObjectHideFlags: 0
Expand All @@ -1482,11 +1316,11 @@ Transform:
m_GameObject: {fileID: 1816873676}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 101.218155, y: 29.739756, z: 3.4037292}
m_LocalScale: {x: 7.2, y: 7.2, z: 7.2}
m_LocalPosition: {x: 0, y: 0, z: 90.47274}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2924143437311501568}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1873413166
GameObject:
Expand Down Expand Up @@ -1789,20 +1623,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6572322120291158432, guid: 357a8a33577bbd7459b86560228ad707, type: 3}
insertIndex: -1
addedObject: {fileID: 1816873678}
- targetCorrespondingSourceObject: {fileID: 6572322120291158432, guid: 357a8a33577bbd7459b86560228ad707, type: 3}
insertIndex: -1
addedObject: {fileID: 929270314}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 357a8a33577bbd7459b86560228ad707, type: 3}
--- !u!224 &2924143437311501568 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6572322120291158432, guid: 357a8a33577bbd7459b86560228ad707, type: 3}
m_PrefabInstance: {fileID: 2924143437311501567}
m_PrefabAsset: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Expand All @@ -1812,3 +1635,4 @@ SceneRoots:
- {fileID: 1738735235}
- {fileID: 959063386}
- {fileID: 2924143437311501567}
- {fileID: 1816873678}
Loading

0 comments on commit eeeab53

Please sign in to comment.