From ff3f9c75fccb3fbb7b882ec29e754e6135b53e60 Mon Sep 17 00:00:00 2001 From: miepzerino <o.skotnik@gmail.com> Date: Tue, 01 Apr 2025 20:58:42 +0000 Subject: [PATCH] #25 oreTiles now connect to forestTiles --- Assets/Scenes/GameplayScene.unity | 1384 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 1,326 insertions(+), 58 deletions(-) diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity index dc43a1c..58e123e 100644 --- a/Assets/Scenes/GameplayScene.unity +++ b/Assets/Scenes/GameplayScene.unity @@ -198,6 +198,233 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 32697240} m_CullTransparentMesh: 1 +--- !u!1 &97771186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 97771190} + - component: {fileID: 97771189} + - component: {fileID: 97771188} + - component: {fileID: 97771187} + m_Layer: 5 + m_Name: UIWorld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &97771187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97771186} + 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 &97771188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97771186} + 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 + m_PresetInfoIsWorld: 1 +--- !u!223 &97771189 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97771186} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 519420031} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &97771190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97771186} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 530.5, y: 298.5} + m_SizeDelta: {x: 1061, y: 597} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &144062416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 144062417} + - component: {fileID: 144062419} + - component: {fileID: 144062418} + m_Layer: 0 + m_Name: Flexalon Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &144062417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 144062416} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -320.00006, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 809488039} + m_Father: {fileID: 1337450960} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &144062418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 144062416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b0da67f6b3c9a4e84ed47af9da4884, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 4 + _widthType: 1 + _width: 100 + _widthOfParent: 1 + _heightType: 1 + _height: 75 + _heightOfParent: 1 + _depthType: 2 + _depth: 1 + _depthOfParent: 1 + _minWidthType: 0 + _minWidth: 0 + _minWidthOfParent: 0 + _minHeightType: 0 + _minHeight: 0 + _minHeightOfParent: 0 + _minDepthType: 0 + _minDepth: 0 + _minDepthOfParent: 0 + _maxWidthType: 0 + _maxWidth: 100 + _maxWidthOfParent: 1 + _maxHeightType: 0 + _maxHeight: 100 + _maxHeightOfParent: 1 + _maxDepthType: 0 + _maxDepth: 1 + _maxDepthOfParent: 1 + _offset: {x: 0, y: 0, z: 0} + _scale: {x: 1, y: 1, z: 1} + _rotation: {x: 0, y: 0, z: 0, w: 1} + _marginLeft: 0 + _marginRight: 0 + _marginTop: 0 + _marginBottom: 0 + _marginFront: 0 + _marginBack: 0 + _paddingLeft: 0 + _paddingRight: 0 + _paddingTop: 0 + _paddingBottom: 0 + _paddingFront: 0 + _paddingBack: 0 + _skipLayout: 0 +--- !u!114 &144062419 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 144062416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 1337450960} + SiblingIndex: 0 + LayoutPosition: {x: -320.00006, y: 0, z: 0} + LayoutRotation: {x: 0, y: 0, z: 0, w: 1} + AdapterBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + LayoutBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + RotatedAndScaledBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + ComponentScale: {x: 1, y: 1, z: 1} + FillSize: {x: 320.00003, y: 80.02514, z: 0} + ShrinkSize: {x: 999999, y: 999999, z: 999999} + TargetPosition: {x: -320.00006, y: 0, z: 0} + TargetRotation: {x: 0, y: 0, z: 0, w: 1} + TargetScale: {x: 1, y: 1, z: 1} + TargetRectSize: {x: 0, y: 0, z: 0} + TransformPosition: {x: -320.00006, y: 0, z: 0} + TransformRotation: {x: 0, y: 0, z: 0, w: 1} + TransformScale: {x: 1, y: 1, z: 1} + TransformRectSize: {x: 0, y: 0} --- !u!1 &167023767 GameObject: m_ObjectHideFlags: 0 @@ -643,6 +870,136 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 530984087} m_CullTransparentMesh: 1 +--- !u!1 &532191277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532191278} + - component: {fileID: 532191280} + - component: {fileID: 532191279} + m_Layer: 0 + m_Name: Flexalon Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532191278 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532191277} + 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: 1725312357} + m_Father: {fileID: 1337450960} + 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: 312.5, y: -5} + m_SizeDelta: {x: 305.00003, y: 70.02514} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &532191279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532191277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b0da67f6b3c9a4e84ed47af9da4884, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 4 + _widthType: 1 + _width: 100 + _widthOfParent: 1 + _heightType: 1 + _height: 75 + _heightOfParent: 1 + _depthType: 2 + _depth: 1 + _depthOfParent: 1 + _minWidthType: 0 + _minWidth: 0 + _minWidthOfParent: 0 + _minHeightType: 0 + _minHeight: 0 + _minHeightOfParent: 0 + _minDepthType: 0 + _minDepth: 0 + _minDepthOfParent: 0 + _maxWidthType: 0 + _maxWidth: 100 + _maxWidthOfParent: 1 + _maxHeightType: 0 + _maxHeight: 100 + _maxHeightOfParent: 1 + _maxDepthType: 0 + _maxDepth: 1 + _maxDepthOfParent: 1 + _offset: {x: 0, y: 0, z: 0} + _scale: {x: 1, y: 1, z: 1} + _rotation: {x: 0, y: 0, z: 0, w: 1} + _marginLeft: 0 + _marginRight: 15 + _marginTop: 10 + _marginBottom: 0 + _marginFront: 0 + _marginBack: 0 + _paddingLeft: 0 + _paddingRight: 0 + _paddingTop: 0 + _paddingBottom: 0 + _paddingFront: 0 + _paddingBack: 0 + _skipLayout: 0 +--- !u!114 &532191280 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532191277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 1337450960} + SiblingIndex: 2 + LayoutPosition: {x: 320, y: 0, z: 0} + LayoutRotation: {x: 0, y: 0, z: 0, w: 1} + AdapterBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 152.50002, y: 35.01257, z: 0} + LayoutBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 152.50002, y: 35.01257, z: 0} + RotatedAndScaledBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 152.50002, y: 35.01257, z: 0} + ComponentScale: {x: 1, y: 1, z: 1} + FillSize: {x: 320.00003, y: 80.02514, z: 0} + ShrinkSize: {x: 999999, y: 999999, z: 999999} + TargetPosition: {x: 312.5, y: -5, z: 0} + TargetRotation: {x: 0, y: 0, z: 0, w: 1} + TargetScale: {x: 1, y: 1, z: 1} + TargetRectSize: {x: 305.00003, y: 70.02514, z: 0} + TransformPosition: {x: 312.5, y: -5, z: 0} + TransformRotation: {x: 0, y: 0, z: 0, w: 1} + TransformScale: {x: 1, y: 1, z: 1} + TransformRectSize: {x: 305.00003, y: 70.02514} --- !u!1 &574500701 GameObject: m_ObjectHideFlags: 0 @@ -678,7 +1035,7 @@ 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: -310.0759} + m_AnchoredPosition: {x: 0, y: -282.60056} m_SizeDelta: {x: 440.00003, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &574500703 @@ -751,7 +1108,7 @@ m_EditorClassIdentifier: Parent: {fileID: 7994983637574174860} SiblingIndex: 2 - LayoutPosition: {x: 0, y: -310.0759, z: 0} + LayoutPosition: {x: 0, y: -282.60056, z: 0} LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} @@ -763,13 +1120,13 @@ m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 220.00002, y: 25, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 440.00003, y: 0, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} - TargetPosition: {x: 0, y: -310.0759, z: 0} + TargetPosition: {x: 0, y: -282.60056, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} TargetRectSize: {x: 440.00003, y: 50, z: 0} - TransformPosition: {x: 0, y: -310.0759, z: 0} + TransformPosition: {x: 0, y: -282.60056, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} TransformRectSize: {x: 440.00003, y: 50} @@ -1219,6 +1576,140 @@ m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &773513039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773513040} + - component: {fileID: 773513042} + - component: {fileID: 773513041} + m_Layer: 0 + m_Name: MaxInventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &773513040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773513039} + 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: 1026478728} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &773513041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773513039} + 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: Inventory + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dfaa183353a3e5c4bbc9aabee7dd8268, type: 2} + m_sharedMaterial: {fileID: -8621457483150523135, guid: dfaa183353a3e5c4bbc9aabee7dd8268, 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: 42 + m_fontSizeBase: 42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &773513042 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773513039} + m_CullTransparentMesh: 1 --- !u!1 &796676098 GameObject: m_ObjectHideFlags: 0 @@ -1456,6 +1947,140 @@ TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} TransformRectSize: {x: 440, y: 505.1518} +--- !u!1 &809488038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 809488039} + - component: {fileID: 809488041} + - component: {fileID: 809488040} + m_Layer: 0 + m_Name: InventoryTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &809488039 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809488038} + 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: 144062417} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &809488040 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809488038} + 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: Inventory + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dfaa183353a3e5c4bbc9aabee7dd8268, type: 2} + m_sharedMaterial: {fileID: -8621457483150523135, guid: dfaa183353a3e5c4bbc9aabee7dd8268, 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: 42 + m_fontSizeBase: 42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &809488041 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809488038} + m_CullTransparentMesh: 1 --- !u!1 &845242599 GameObject: m_ObjectHideFlags: 0 @@ -1562,6 +2187,132 @@ m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1727dce3407104540a6bf21deb2957a8, type: 3} +--- !u!1 &1026478727 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1026478728} + - component: {fileID: 1026478730} + - component: {fileID: 1026478729} + m_Layer: 0 + m_Name: Flexalon Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1026478728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026478727} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.000015258789, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 773513040} + m_Father: {fileID: 1337450960} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1026478729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026478727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b0da67f6b3c9a4e84ed47af9da4884, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 4 + _widthType: 1 + _width: 100 + _widthOfParent: 1 + _heightType: 1 + _height: 75 + _heightOfParent: 1 + _depthType: 2 + _depth: 1 + _depthOfParent: 1 + _minWidthType: 0 + _minWidth: 0 + _minWidthOfParent: 0 + _minHeightType: 0 + _minHeight: 0 + _minHeightOfParent: 0 + _minDepthType: 0 + _minDepth: 0 + _minDepthOfParent: 0 + _maxWidthType: 0 + _maxWidth: 100 + _maxWidthOfParent: 1 + _maxHeightType: 0 + _maxHeight: 100 + _maxHeightOfParent: 1 + _maxDepthType: 0 + _maxDepth: 1 + _maxDepthOfParent: 1 + _offset: {x: 0, y: 0, z: 0} + _scale: {x: 1, y: 1, z: 1} + _rotation: {x: 0, y: 0, z: 0, w: 1} + _marginLeft: 0 + _marginRight: 0 + _marginTop: 0 + _marginBottom: 0 + _marginFront: 0 + _marginBack: 0 + _paddingLeft: 0 + _paddingRight: 0 + _paddingTop: 0 + _paddingBottom: 0 + _paddingFront: 0 + _paddingBack: 0 + _skipLayout: 0 +--- !u!114 &1026478730 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026478727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 1337450960} + SiblingIndex: 1 + LayoutPosition: {x: -0.000015258789, y: 0, z: 0} + LayoutRotation: {x: 0, y: 0, z: 0, w: 1} + AdapterBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + LayoutBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + RotatedAndScaledBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 160.00002, y: 40.01257, z: 0} + ComponentScale: {x: 1, y: 1, z: 1} + FillSize: {x: 320.00003, y: 80.02514, z: 0} + ShrinkSize: {x: 999999, y: 999999, z: 999999} + TargetPosition: {x: -0.000015258789, y: 0, z: 0} + TargetRotation: {x: 0, y: 0, z: 0, w: 1} + TargetScale: {x: 1, y: 1, z: 1} + TargetRectSize: {x: 0, y: 0, z: 0} + TransformPosition: {x: -0.000015258789, y: 0, z: 0} + TransformRotation: {x: 0, y: 0, z: 0, w: 1} + TransformScale: {x: 1, y: 1, z: 1} + TransformRectSize: {x: 0, y: 0} --- !u!1 &1029677422 GameObject: m_ObjectHideFlags: 0 @@ -1781,6 +2532,52 @@ m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1162250617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1162250618} + - component: {fileID: 1162250619} + m_Layer: 0 + m_Name: ItemDatabase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1162250618 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162250617} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 39.50601, y: 0.48070514, z: 3.8040042} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1162250619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162250617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4d1fabb0e4577b4d987741f664e3d68, type: 3} + m_Name: + m_EditorClassIdentifier: + items: + - {fileID: 7215668260114684477, guid: ead8eea59ce41c244814a994365e1129, type: 3} --- !u!1 &1190838619 GameObject: m_ObjectHideFlags: 0 @@ -1829,6 +2626,140 @@ m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1205505956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1205505957} + - component: {fileID: 1205505959} + - component: {fileID: 1205505958} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1205505957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205505956} + 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: 1725312357} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1205505958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205505956} + 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: X + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1205505959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205505956} + m_CullTransparentMesh: 1 --- !u!1 &1223747237 GameObject: m_ObjectHideFlags: 0 @@ -2837,6 +3768,161 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317463990} m_CullTransparentMesh: 1 +--- !u!1 &1337450959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1337450960} + - component: {fileID: 1337450963} + - component: {fileID: 1337450962} + - component: {fileID: 1337450961} + m_Layer: 0 + m_Name: Flexible Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1337450960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337450959} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 320.10056, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 144062417} + - {fileID: 1026478728} + - {fileID: 532191278} + m_Father: {fileID: 5741503827075688627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1337450961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337450959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bcb5ae438b41e3449fdddabaf22c434, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 4 + _direction: 0 + _wrap: 0 + _wrapDirection: 3 + _horizontalAlign: 1 + _verticalAlign: 1 + _depthAlign: 1 + _horizontalInnerAlign: 1 + _verticalInnerAlign: 1 + _depthInnerAlign: 1 + _gapType: 0 + _gap: 0 + _wrapGapType: 0 + _wrapGap: 0 +--- !u!114 &1337450962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337450959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b0da67f6b3c9a4e84ed47af9da4884, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: 4 + _widthType: 1 + _width: 100 + _widthOfParent: 1 + _heightType: 1 + _height: 75 + _heightOfParent: 0.125 + _depthType: 2 + _depth: 1 + _depthOfParent: 1 + _minWidthType: 0 + _minWidth: 0 + _minWidthOfParent: 0 + _minHeightType: 0 + _minHeight: 0 + _minHeightOfParent: 0 + _minDepthType: 0 + _minDepth: 0 + _minDepthOfParent: 0 + _maxWidthType: 0 + _maxWidth: 100 + _maxWidthOfParent: 1 + _maxHeightType: 0 + _maxHeight: 100 + _maxHeightOfParent: 1 + _maxDepthType: 0 + _maxDepth: 1 + _maxDepthOfParent: 1 + _offset: {x: 0, y: 0, z: 0} + _scale: {x: 1, y: 1, z: 1} + _rotation: {x: 0, y: 0, z: 0, w: 1} + _marginLeft: 0 + _marginRight: 0 + _marginTop: 0 + _marginBottom: 0 + _marginFront: 0 + _marginBack: 0 + _paddingLeft: 0 + _paddingRight: 0 + _paddingTop: 0 + _paddingBottom: 0 + _paddingFront: 0 + _paddingBack: 0 + _skipLayout: 0 +--- !u!114 &1337450963 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337450959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 5741503827075688627} + SiblingIndex: 0 + LayoutPosition: {x: 0, y: 320.10056, z: 0} + LayoutRotation: {x: 0, y: 0, z: 0, w: 1} + AdapterBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 480.00003, y: 40.01257, z: 0} + LayoutBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 480.00003, y: 40.01257, z: 0} + RotatedAndScaledBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 480.00003, y: 40.01257, z: 0} + ComponentScale: {x: 1, y: 1, z: 1} + FillSize: {x: 960.00006, y: 640.2011, z: 0} + ShrinkSize: {x: 999999, y: 999999, z: 999999} + TargetPosition: {x: 0, y: 320.10056, z: 0} + TargetRotation: {x: 0, y: 0, z: 0, w: 1} + TargetScale: {x: 1, y: 1, z: 1} + TargetRectSize: {x: 0, y: 0, z: 0} + TransformPosition: {x: 0, y: 320.10056, z: 0} + TransformRotation: {x: 0, y: 0, z: 0, w: 1} + TransformScale: {x: 1, y: 1, z: 1} + TransformRectSize: {x: 0, y: 0} --- !u!1 &1406521042 GameObject: m_ObjectHideFlags: 0 @@ -3119,6 +4205,176 @@ m_Script: {fileID: 11500000, guid: 1a8a05de0ac134f4f9d01bef6b9da077, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1725312356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1725312357} + - component: {fileID: 1725312361} + - component: {fileID: 1725312360} + - component: {fileID: 1725312359} + - component: {fileID: 1725312358} + m_Layer: 0 + m_Name: CloseInventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1725312357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725312356} + 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: 1205505957} + m_Father: {fileID: 532191278} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.000015258789, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1725312358 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725312356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 0} + SiblingIndex: 0 + LayoutPosition: {x: 0, y: 0, z: 0} + LayoutRotation: {x: 0, y: 0, z: 0, w: 1} + AdapterBounds: + m_Center: {x: -25, y: 0, z: 0} + m_Extent: {x: 25, y: 25, z: 0} + LayoutBounds: + m_Center: {x: -25, y: 0, z: 0} + m_Extent: {x: 25, y: 25, z: 0} + RotatedAndScaledBounds: + m_Center: {x: -25, y: 0, z: 0} + m_Extent: {x: 25, y: 25, z: 0} + ComponentScale: {x: 1, y: 1, z: 1} + FillSize: {x: 305.00003, y: 70.03281, z: 0} + ShrinkSize: {x: 999999, y: 999999, z: 999999} + TargetPosition: {x: 460.00003, y: -630.2789, z: 0} + TargetRotation: {x: -0, y: -0, z: -0, w: 1} + TargetScale: {x: 1, y: 1, z: 1} + TargetRectSize: {x: 50, y: 50, z: 0} + TransformPosition: {x: 152.5, y: 0, z: 0} + TransformRotation: {x: -0, y: -0, z: -0, w: 1} + TransformScale: {x: 1, y: 1, z: 1} + TransformRectSize: {x: 50, y: 50} +--- !u!114 &1725312359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725312356} + 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: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} + m_PressedColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, 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: 1725312360} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7398061984209721034} + m_TargetAssemblyTypeName: InventoryDisplay, Assembly-CSharp + m_MethodName: ToggleInventoryPanel + 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 +--- !u!114 &1725312360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725312356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6d3aa117382ad23488982f3a37e18466, 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 &1725312361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725312356} + m_CullTransparentMesh: 1 --- !u!1 &1826729469 GameObject: m_ObjectHideFlags: 0 @@ -3613,13 +4869,13 @@ m_Script: {fileID: 11500000, guid: 000b2ca4a3c14d04e8c8a5c1084c700f, type: 3} m_Name: m_EditorClassIdentifier: - forestRuleTile: {fileID: 11400000, guid: e77c00aec3ec74f4a9ec15ef63c3f9a7, type: 2} + forestRuleTile: {fileID: 11400000, guid: 3999614e192b37546a6b710bf5ceb30c, type: 2} borderTile: {fileID: 11400000, guid: dcef846474e534b45ab3b175559c19a2, type: 2} ores: - name: Iron weight: 7 clusterWeight: 40 - tile: {fileID: 11400000, guid: 4d8deb60103293942a07fd9361be5e8f, type: 2} + tile: {fileID: 11400000, guid: bbc5a3964d8331546a4dbc880f8ae9fc, type: 2} maxSpawnHeight: 250 minSpawnHeight: 150 --- !u!1 &1955008394 @@ -3987,6 +5243,14 @@ propertyPath: levelChanger value: objectReference: {fileID: 977175855} + - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3} + propertyPath: worldSpaceUI + value: + objectReference: {fileID: 97771189} + - target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3} + propertyPath: lootTextPrefab + value: + objectReference: {fileID: 456827189715955869, guid: 9014e3792e948bf4e81fdfdc7f38c5d9, type: 3} - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3} propertyPath: m_ActionEvents.Array.size value: 15 @@ -5053,7 +6317,7 @@ m_GameObject: {fileID: 4541543099627855440} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -27.512573, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5266,24 +6530,24 @@ LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 252.5759, z: 0} + m_Extent: {x: 220.00002, y: 225.10056, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 252.5759, z: 0} + m_Extent: {x: 220.00002, y: 225.10056, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 252.5759, z: 0} + m_Extent: {x: 220.00002, y: 225.10056, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 440.00003, y: 505.1518, z: 0} + FillSize: {x: 440.00003, y: 450.2011, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} TargetPosition: {x: 0, y: -12.5, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} - TargetRectSize: {x: 440.00003, y: 505.1518, z: 0} + TargetRectSize: {x: 440.00003, y: 450.2011, z: 0} TransformPosition: {x: 0, y: -12.5, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} - TransformRectSize: {x: 440.00003, y: 505.1518} + TransformRectSize: {x: 440.00003, y: 450.2011} --- !u!224 &1249761801454750281 RectTransform: m_ObjectHideFlags: 0 @@ -5302,7 +6566,7 @@ m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -12.5} - m_SizeDelta: {x: 440.00003, y: 505.1518} + m_SizeDelta: {x: 440.00003, y: 450.2011} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1264119802676118300 GameObject: @@ -5807,8 +7071,8 @@ 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.000061035156} - m_SizeDelta: {x: 0, y: -610.1518} + m_AnchoredPosition: {x: 0, y: -0.000030517578} + m_SizeDelta: {x: 0, y: -555.2011} m_Pivot: {x: 0, y: 1} --- !u!114 &1808165083591296092 MonoBehaviour: @@ -5867,24 +7131,24 @@ LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 460.00003, y: 615.2011, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} TargetPosition: {x: 0, y: 0, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} - TargetRectSize: {x: 460.00003, y: 670.1518, z: 0} + TargetRectSize: {x: 460.00003, y: 615.2011, z: 0} TransformPosition: {x: 0, y: 0, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} - TransformRectSize: {x: 460.00003, y: 670.1518} + TransformRectSize: {x: 460.00003, y: 615.2011} --- !u!114 &1898426490954501297 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5915,7 +7179,7 @@ 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: 297.5759} + m_AnchoredPosition: {x: 0, y: 270.10056} m_SizeDelta: {x: 440.00003, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1901413943316119649 @@ -6546,15 +7810,15 @@ LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 335.0759, z: 0} + m_Extent: {x: 220.00002, y: 307.60056, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 335.0759, z: 0} + m_Extent: {x: 220.00002, y: 307.60056, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 220.00002, y: 335.0759, z: 0} + m_Extent: {x: 220.00002, y: 307.60056, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 460.00003, y: 615.2011, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} TargetPosition: {x: 240.00002, y: 0, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} @@ -7028,26 +8292,26 @@ m_Name: m_EditorClassIdentifier: Parent: {fileID: 5741503827075688627} - SiblingIndex: 0 - LayoutPosition: {x: 0, y: 0, z: 0} + SiblingIndex: 1 + LayoutPosition: {x: 0, y: -40.012573, z: 0} LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 460.00003, y: 335.0759, z: 0} + m_Extent: {x: 460.00003, y: 307.60056, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 460.00003, y: 335.0759, z: 0} + m_Extent: {x: 460.00003, y: 307.60056, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 460.00003, y: 335.0759, z: 0} + m_Extent: {x: 460.00003, y: 307.60056, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 960.00006, y: 640.2011, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} - TargetPosition: {x: 0, y: 0, z: 0} + TargetPosition: {x: 0, y: -27.512573, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} TargetRectSize: {x: 0, y: 0, z: 0} - TransformPosition: {x: 0, y: 0, z: 0} + TransformPosition: {x: 0, y: -27.512573, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} TransformRectSize: {x: 0, y: 0} @@ -7950,8 +9214,8 @@ m_Children: - {fileID: 8239203837511537697} - {fileID: 260833814302493820} - - {fileID: 5263691984176372805} - {fileID: 3681495750616444927} + - {fileID: 5263691984176372805} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -9100,13 +10364,14 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1337450960} - {fileID: 1056274434389685418} m_Father: {fileID: 3681495750616444927} 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: 960.00006, y: 720.1518} + m_SizeDelta: {x: 960.00006, y: 720.22626} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5767075612374987226 CanvasRenderer: @@ -9810,24 +11075,24 @@ LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 230.00002, y: 335.0759, z: 0} + m_Extent: {x: 230.00002, y: 307.60056, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 460.00003, y: 615.2011, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} TargetPosition: {x: -230.00002, y: 0, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} - TargetRectSize: {x: 460.00003, y: 670.1518, z: 0} + TargetRectSize: {x: 460.00003, y: 615.2011, z: 0} TransformPosition: {x: -230.00002, y: 0, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} - TransformRectSize: {x: 460.00003, y: 670.1518} + TransformRectSize: {x: 460.00003, y: 615.2011} --- !u!1 &6744622266729990927 GameObject: m_ObjectHideFlags: 0 @@ -9967,24 +11232,24 @@ LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 480.00003, y: 360.0759, z: 0} + m_Extent: {x: 480.00003, y: 360.11313, z: 0} LayoutBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 480.00003, y: 360.0759, z: 0} + m_Extent: {x: 480.00003, y: 360.11313, z: 0} RotatedAndScaledBounds: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 480.00003, y: 360.0759, z: 0} + m_Extent: {x: 480.00003, y: 360.11313, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 1600, y: 900.18976, z: 0} + FillSize: {x: 1600, y: 900.2828, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} TargetPosition: {x: 0, y: 0, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} - TargetRectSize: {x: 960.00006, y: 720.1518, z: 0} + TargetRectSize: {x: 960.00006, y: 720.22626, z: 0} TransformPosition: {x: 0, y: 0, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} - TransformRectSize: {x: 960.00006, y: 720.1518} + TransformRectSize: {x: 960.00006, y: 720.22626} --- !u!114 &6849174149407261623 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10131,7 +11396,7 @@ _rotation: {x: 0, y: 0, z: 0, w: 1} _marginLeft: 20 _marginRight: 20 - _marginTop: 25 + _marginTop: 0 _marginBottom: 25 _marginFront: 0 _marginBack: 0 @@ -10160,7 +11425,7 @@ m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -230.00002, y: 0} - m_SizeDelta: {x: 460.00003, y: 670.1518} + m_SizeDelta: {x: 460.00003, y: 615.2011} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6948225412248414081 CanvasRenderer: @@ -10484,7 +11749,7 @@ m_EditorClassIdentifier: Parent: {fileID: 7994983637574174860} SiblingIndex: 0 - LayoutPosition: {x: 0, y: 297.5759, z: 0} + LayoutPosition: {x: 0, y: 270.10056, z: 0} LayoutRotation: {x: 0, y: 0, z: 0, w: 1} AdapterBounds: m_Center: {x: 0, y: 0, z: 0} @@ -10496,13 +11761,13 @@ m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 220.00002, y: 37.5, z: 0} ComponentScale: {x: 1, y: 1, z: 1} - FillSize: {x: 0, y: 0, z: 0} + FillSize: {x: 440.00003, y: 0, z: 0} ShrinkSize: {x: 999999, y: 999999, z: 999999} - TargetPosition: {x: 0, y: 297.5759, z: 0} + TargetPosition: {x: 0, y: 270.10056, z: 0} TargetRotation: {x: 0, y: 0, z: 0, w: 1} TargetScale: {x: 1, y: 1, z: 1} TargetRectSize: {x: 440.00003, y: 75, z: 0} - TransformPosition: {x: 0, y: 297.5759, z: 0} + TransformPosition: {x: 0, y: 270.10056, z: 0} TransformRotation: {x: 0, y: 0, z: 0, w: 1} TransformScale: {x: 1, y: 1, z: 1} TransformRectSize: {x: 440.00003, y: 75} @@ -10544,6 +11809,7 @@ itemNameDescription: {fileID: 5479754380044115795} itemDescription: {fileID: 167023767} itemDeleteButton: {fileID: 530984087} + inventoryMaxAmount: {fileID: 773513039} itemUIs: [] --- !u!114 &7412360115378337142 MonoBehaviour: @@ -11419,7 +12685,7 @@ m_Name: m_EditorClassIdentifier: _version: 4 - _direction: 0 + _direction: 3 _wrap: 0 _wrapDirection: 3 _horizontalAlign: 1 @@ -12420,7 +13686,7 @@ 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: 460.00003, y: 670.1518} + m_SizeDelta: {x: 460.00003, y: 615.2011} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &8915255185645906953 RectTransform: @@ -12765,8 +14031,10 @@ - {fileID: 727795133} - {fileID: 75655679957548990} - {fileID: 4515621798426421079} + - {fileID: 97771190} - {fileID: 1409843026} - {fileID: 1406521045} - {fileID: 1007461191} - {fileID: 318061306} - {fileID: 1190838621} + - {fileID: 1162250618} -- Gitblit v1.9.3