Intrepid/gardens-of-nil-3d-u6
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes on UI

Browse Source
This commit is contained in:
Nilton Constantino 2026-06-12 13:04:20 +01:00
parent f75695bc43
commit db828be164
No known key found for this signature in database
11 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/Prefabs/UI/ActionBelt.prefab
View File

@ -36,8 +36,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 10} m_AnchoredPosition: {x: 45, y: 30}
m_SizeDelta: {x: -20, y: 30} m_SizeDelta: {x: -110, y: 20}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3109608898981227386 --- !u!222 &3109608898981227386
CanvasRenderer: CanvasRenderer:
@ -111,7 +111,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 125, y: 175} m_SizeDelta: {x: 90, y: 125}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!1 &1210064884852877568 --- !u!1 &1210064884852877568
GameObject: GameObject:
@ -152,7 +152,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 20} m_AnchoredPosition: {x: 0, y: 20}
m_SizeDelta: {x: 750, y: 175} m_SizeDelta: {x: 474, y: 126}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!225 &5362238856615007216 --- !u!225 &5362238856615007216
CanvasGroup: CanvasGroup:
@ -359,7 +359,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 500, y: 175} m_SizeDelta: {x: 300, y: 125}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!1 &2169731595684440506 --- !u!1 &2169731595684440506
GameObject: GameObject:
@ -655,10 +655,10 @@ RectTransform:
- {fileID: 8639643552490286096} - {fileID: 8639643552490286096}
m_Father: {fileID: 8347068417609933848} m_Father: {fileID: 8347068417609933848}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -135, y: -5} m_AnchoredPosition: {x: 0, y: 5}
m_SizeDelta: {x: 225, y: 50} m_SizeDelta: {x: 270, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4797126571072361863 --- !u!1 &4797126571072361863
GameObject: GameObject:
@ -694,7 +694,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 125, y: 175} m_SizeDelta: {x: 90, y: 125}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!1 &5379922815610353284 --- !u!1 &5379922815610353284
GameObject: GameObject:
@ -805,8 +805,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 60, y: 20} m_AnchoredPosition: {x: 45, y: 20}
m_SizeDelta: {x: -140, y: 50} m_SizeDelta: {x: -110, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1510678006662779526 --- !u!222 &1510678006662779526
CanvasRenderer: CanvasRenderer:
@ -863,8 +863,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 36 m_fontSize: 24
m_fontSizeBase: 36 m_fontSizeBase: 24
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@ -1380,7 +1380,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -10} m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 110, y: 110} m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &7932382647549546298 --- !u!222 &7932382647549546298
CanvasRenderer: CanvasRenderer:
@ -1596,7 +1596,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3} - target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 110 value: 80
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3} - target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -1968,7 +1968,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3} - target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 110 value: 80
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3} - target: {fileID: 4122311943219390533, guid: 18f44b986d2754181a3a9695f6898774, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

2
Assets/Resources/Tags/Windows/action-belt.window.data.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 671522e89c004981804e95c2e4772ba4, type: 3} m_Script: {fileID: 11500000, guid: 671522e89c004981804e95c2e4772ba4, type: 3}
m_Name: action-belt.window.data m_Name: action-belt.window.data
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowData
id: 69910a851d784149bbba17e5e0dd026a id: a35f38b0d2af466c9b0557c538c1f733
shouldBeKeptAlwaysEnabled: 1 shouldBeKeptAlwaysEnabled: 1
onEntry: {fileID: 11400000, guid: b12d41919e089475da15bef8808f80b8, type: 2} onEntry: {fileID: 11400000, guid: b12d41919e089475da15bef8808f80b8, type: 2}
onExit: {fileID: 11400000, guid: 86176d631377e4d5fba70988ef37e9d9, type: 2} onExit: {fileID: 11400000, guid: 86176d631377e4d5fba70988ef37e9d9, type: 2}

4
Assets/Resources/Tags/Windows/action-belt.window.enter.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3} m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3}
m_Name: action-belt.window.enter m_Name: action-belt.window.enter
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData
mode: 1 mode: 0
direction: 0 direction: 0
soundEffect: {fileID: 0} soundEffect: {fileID: 0}
animationSpeed: 5 animationSpeed: 2

4
Assets/Resources/Tags/Windows/action-belt.window.exit.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3} m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3}
m_Name: action-belt.window.exit m_Name: action-belt.window.exit
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData
mode: 1 mode: 0
direction: 1 direction: 1
soundEffect: {fileID: 0} soundEffect: {fileID: 0}
animationSpeed: 5 animationSpeed: 2

2
Assets/Resources/Tags/Windows/world-overlay.window.data.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 671522e89c004981804e95c2e4772ba4, type: 3} m_Script: {fileID: 11500000, guid: 671522e89c004981804e95c2e4772ba4, type: 3}
m_Name: world-overlay.window.data m_Name: world-overlay.window.data
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowData
id: d9f8d3559eb2489cb94739ed883d3360 id: f37754ed82f84d13b3ff890b11fc7c83
shouldBeKeptAlwaysEnabled: 0 shouldBeKeptAlwaysEnabled: 0
onEntry: {fileID: 11400000, guid: 82f061381bd6041e89c7a94e57153999, type: 2} onEntry: {fileID: 11400000, guid: 82f061381bd6041e89c7a94e57153999, type: 2}
onExit: {fileID: 11400000, guid: 645c3f5b37b664fe2be06cdff30c678a, type: 2} onExit: {fileID: 11400000, guid: 645c3f5b37b664fe2be06cdff30c678a, type: 2}

4
Assets/Resources/Tags/Windows/world-overlay.window.enter.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3} m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3}
m_Name: world-overlay.window.enter m_Name: world-overlay.window.enter
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData
mode: 1 mode: 2
direction: 0 direction: 0
soundEffect: {fileID: 0} soundEffect: {fileID: 0}
animationSpeed: 5 animationSpeed: 2

4
Assets/Resources/Tags/Windows/world-overlay.window.exit.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3} m_Script: {fileID: 11500000, guid: 6f2337b04d5e44dba892ac6b72ae7e44, type: 3}
m_Name: world-overlay.window.exit m_Name: world-overlay.window.exit
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.Data.WindowAnimationData
mode: 1 mode: 2
direction: 1 direction: 1
soundEffect: {fileID: 0} soundEffect: {fileID: 0}
animationSpeed: 5 animationSpeed: 10

58
Assets/Scenes/5. Gameplay.unity
View File

@ -1437,9 +1437,8 @@ GameObject:
- component: {fileID: 152751379} - component: {fileID: 152751379}
- component: {fileID: 152751382} - component: {fileID: 152751382}
- component: {fileID: 152751381} - component: {fileID: 152751381}
- component: {fileID: 152751380}
m_Layer: 5 m_Layer: 5
m_Name: Canvas 1024 x 720 m_Name: Canvas 1024 x 576
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -1466,21 +1465,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!114 &152751380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 152751378}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8d6bcfd7fe44d6c89229eb87c0a3296, type: 3}
m_Name:
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.WindowController
subscriptionId: 384b1ac19e1a4cbfb6313e530996fd76
initialWindows: []
firstFocusItem: {fileID: 0}
--- !u!114 &152751381 --- !u!114 &152751381
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1496,7 +1480,7 @@ MonoBehaviour:
m_UiScaleMode: 1 m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 64 m_ReferencePixelsPerUnit: 64
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 720} m_ReferenceResolution: {x: 1024, y: 576}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0.5 m_MatchWidthOrHeight: 0.5
m_PhysicalUnit: 3 m_PhysicalUnit: 3
@ -7157,8 +7141,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 20} m_AnchoredPosition: {x: 0, y: 50}
m_SizeDelta: {x: 750, y: 175} m_SizeDelta: {x: 474, y: 126}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!1001 &1143872955 --- !u!1001 &1143872955
PrefabInstance: PrefabInstance:
@ -22577,7 +22561,6 @@ GameObject:
- component: {fileID: 1497838090} - component: {fileID: 1497838090}
- component: {fileID: 1497838091} - component: {fileID: 1497838091}
- component: {fileID: 1497838092} - component: {fileID: 1497838092}
- component: {fileID: 1497838093}
m_Layer: 5 m_Layer: 5
m_Name: Canvas 1920 x 1080 m_Name: Canvas 1920 x 1080
m_TagString: Untagged m_TagString: Untagged
@ -22651,22 +22634,6 @@ MonoBehaviour:
m_DefaultSpriteDPI: 96 m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1 m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0 m_PresetInfoIsWorld: 0
--- !u!114 &1497838093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1497838089}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8d6bcfd7fe44d6c89229eb87c0a3296, type: 3}
m_Name:
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.WindowController
subscriptionId: 02a717f284a84688bbee601879230537
initialWindows:
- {fileID: 1953131096}
firstFocusItem: {fileID: 0}
--- !u!1 &1501201612 --- !u!1 &1501201612
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -25721,6 +25688,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2018333464} - component: {fileID: 2018333464}
- component: {fileID: 2018333465}
m_Layer: 0 m_Layer: 0
m_Name: UI m_Name: UI
m_TagString: Untagged m_TagString: Untagged
@ -25745,6 +25713,22 @@ Transform:
- {fileID: 1497838090} - {fileID: 1497838090}
m_Father: {fileID: 559238034} m_Father: {fileID: 559238034}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2018333465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018333463}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8d6bcfd7fe44d6c89229eb87c0a3296, type: 3}
m_Name:
m_EditorClassIdentifier: Intrepid General Utilities::Intrepid.Window.WindowController
subscriptionId: e9b0a5efbf1449f887292c2d59c7919a
initialWindows:
- {fileID: 1953131096}
firstFocusItem: {fileID: 0}
--- !u!95 &2042901331 stripped --- !u!95 &2042901331 stripped
Animator: Animator:
m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3} m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 208cb7d0ce6444ed7b55f4c4b4e632aa, type: 3}

14
Assets/Scripts/Intrepid/Core/Camera/CameraZoomManager.cs
View File

@ -30,13 +30,13 @@ namespace Intrepid.Core.Camera
protected override void OnBootstrap() protected override void OnBootstrap()
{ {
var stack = CameraSystem.Instance.CurrentCameraStreamStack; // var stack = CameraSystem.Instance.CurrentCameraStreamStack;
if (stack.IsNotNull()) // if (stack.IsNotNull())
{ // {
var lens = stack.TopCameraStream.VCamera.Lens; // var lens = stack.TopCameraStream.VCamera.Lens;
lens.OrthographicSize = startOrthographicSize; // lens.OrthographicSize = startOrthographicSize;
stack.TopCameraStream.VCamera.Lens = lens; // stack.TopCameraStream.VCamera.Lens = lens;
} // }
} }
protected override void Subscriptions() protected override void Subscriptions()

4
Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelCameraManager.cs
View File

@ -16,12 +16,12 @@ namespace Intrepid.Gameplay.Entities.Player.Sentinel
protected override void InitializeVariables() protected override void InitializeVariables()
{ {
CameraStreamStack.Transform = Brain.Entity.RigidBodyTransform;
CameraStreamStack.Push(follow, true);
} }
protected override void OnBootstrap() protected override void OnBootstrap()
{ {
CameraStreamStack.Transform = Brain.Entity.RigidBodyTransform;
CameraStreamStack.Push(follow, true);
} }
protected override void Subscriptions() protected override void Subscriptions()

2
Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStatePDA.cs
View File

@ -38,7 +38,7 @@ namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States
}); });
Proxy.Instance.EventBus.Raise(new WindowOpenEvent Proxy.Instance.EventBus.Raise(new WindowOpenEvent
{ {
ShouldStack = false, ShouldStack = true,
WindowDataList = new List<WindowData> WindowDataList = new List<WindowData>
{ {
pdaWindowData pdaWindowData