From 199ab2852fbe1b29e6dd43c691e3740c14a863e6 Mon Sep 17 00:00:00 2001 From: Gleb Date: Sun, 1 Sep 2024 22:57:00 +0100 Subject: [PATCH] 0.3.7.837 --- .config/dotnet-tools.json | 2 +- Directory.Build.props | 2 +- RbfxTemplate/GameState.cs | 7 +++---- RbfxTemplate/GameStates/DragState.cs | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 84507fb..63a62aa 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "unofficial.Urho3DNet.Editor": { - "version": "0.3.7.832", + "version": "0.3.7.837", "commands": [ "rbfx" ] diff --git a/Directory.Build.props b/Directory.Build.props index fb07e1d..98d2a15 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 0.3.7.832 + 0.3.7.837 \ No newline at end of file diff --git a/RbfxTemplate/GameState.cs b/RbfxTemplate/GameState.cs index 5bdedfb..ab7211f 100644 --- a/RbfxTemplate/GameState.cs +++ b/RbfxTemplate/GameState.cs @@ -219,9 +219,9 @@ public Tile CreateTile(string imageName) m.SetTexture("Albedo", tex); var tile = _scene.Ptr.InstantiatePrefab(_tilePrefab); - var model = tile.GetComponent(true); + var model = tile.FindComponent(ComponentSearchFlag.Default); model.SetMaterial(m); - return tile.GetComponent(true); + return tile.FindComponent(ComponentSearchFlag.Default); } public Ray GetScreenRay(IntVector2 inputMousePosition) @@ -235,8 +235,7 @@ public Tile PickTile(IntVector2 inputMousePosition) var physics = _scene.Ptr.GetComponent(); physics.RaycastSingle(_raycastResult, ray, 100); if (_raycastResult.Body != null) - return _raycastResult.Body.Node.GetComponent() ?? - _raycastResult.Body.Node.GetParentComponent(true); + return _raycastResult.Body.Node.FindComponent(ComponentSearchFlag.SelfOrParentRecursive); return null; } diff --git a/RbfxTemplate/GameStates/DragState.cs b/RbfxTemplate/GameStates/DragState.cs index 32ca25f..afb1031 100644 --- a/RbfxTemplate/GameStates/DragState.cs +++ b/RbfxTemplate/GameStates/DragState.cs @@ -58,7 +58,7 @@ public void TrackTile(Tile tile, InteractionKey interactionKey) _interactionKey = interactionKey; tile.LinkTo(null); var material = Context.ResourceCache.GetResource("Materials/White.material"); - tile.Link.GetComponent(true).SetMaterial(material); + tile.Link.FindComponent(ComponentSearchFlag.Default | ComponentSearchFlag.Disabled).SetMaterial(material); } private void MoveLink(IntVector2 intVector2)