0.3.7.802

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "unofficial.Urho3DNet.Editor": {
-      "version": "0.3.7.800",
+      "version": "0.3.7.802",
       "commands": [
         "rbfx"
       ]

Content/Common/Data/UI/MainMenu.rml

@@ -44,6 +44,9 @@
 		<input type="button" class="blue-button" style="display: block" data-event-click="NewGame">
 			New game
 		</input>
+		<input type="button" class="blue-button" style="display: block"  data-event-click="Settings">
+			Settings
+		</input>
 		<input type="button" class="blue-button" style="display: block"  data-event-click="Exit">
 			Exit
 		</input>

Content/Common/Data/UI/PrivacyPolicy.rml

@@ -39,6 +39,9 @@
 		<input type="button" class="blue-button" style="display: block" data-event-click="Accept">
 			Accept
 		</input>
+		<input type="button" class="orange-button" style="display: block" data-event-click="Reject">
+			Reject
+		</input>
 	</div>
 </body>
 

Directory.Build.props

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Urho3DNetVersion>0.3.7.800</Urho3DNetVersion>
+    <Urho3DNetVersion>0.3.7.802</Urho3DNetVersion>
   </PropertyGroup>
 </Project>

RbfxTemplate/AcceptPrivacyPolicyState.cs

@@ -26,6 +26,7 @@ public override void OnDataModelInitialized(GameRmlUIComponent component)
         {
             component.BindDataModelEvent("PrivacyPolicy", OnPrivacyPolicy);
             component.BindDataModelEvent("Accept", OnAccept);
+            component.BindDataModelEvent("Reject", OnReject);
         }
 
         public void OnPrivacyPolicy(VariantList variantList)
@@ -39,6 +40,11 @@ public void OnAccept(VariantList variantList)
             Application.AcceptPrivacyPolicy();
         }
 
+        public void OnReject(VariantList variantList)
+        {
+            Application.RejectPrivacyPolicy();
+        }
+
         public void OnContinue(VariantList variantList)
         {
             Application.ContinueGame();

RbfxTemplate/GameSettings.cs

@@ -1,4 +1,5 @@
-using Urho3DNet;
+using System;
+using Urho3DNet;
 
 namespace RbfxTemplate
 {
@@ -30,6 +31,11 @@ public class GameSettings
         /// </summary>
         public float EffectVolume { get; set; } = 1.0f;
 
+        /// <summary>
+        /// Time when privacy policy was accepted or null if it wasn't.
+        /// </summary>
+        public bool? PrivacyPolicyAccepted { get; set; }
+
         /// <summary>
         ///     Apply settings to the application global settings.
         /// </summary>

RbfxTemplate/MainMenuState.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime;
 using System.Runtime.InteropServices;
 using Urho3DNet;
 
@@ -31,6 +32,7 @@ public override void OnDataModelInitialized(GameRmlUIComponent component)
             component.BindDataModelProperty("game_title", _ => _.Set("Awesome game"), _ => { });
             component.BindDataModelEvent("Continue", OnContinue);
             component.BindDataModelEvent("NewGame", OnNewGame);
+            component.BindDataModelEvent("Settings", OnSettings);
             component.BindDataModelEvent("Exit", OnExit);
             component.BindDataModelEvent("Discord", OnDiscord);
         }
@@ -40,6 +42,11 @@ public void OnNewGame(VariantList variantList)
             Application.ToNewGame();
         }
 
+        public void OnSettings(VariantList variantList)
+        {
+            Application.ToSettings();
+        }
+
         public void OnExit(VariantList variantList)
         {
             Application.Quit();

RbfxTemplate/RmlUIStateBase.cs

@@ -18,7 +18,6 @@ public abstract class RmlUIStateBase : ApplicationState, INotifyPropertyChanged
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
 
-
         /// <summary>
         /// Construct RmlUIStateBase.
         /// </summary>
@@ -56,7 +55,7 @@ public RmlUIStateBase(UrhoPluginApplication app, string rmlResource) : base(app.
         public abstract void OnDataModelInitialized(GameRmlUIComponent component);
 
         /// <summary>
-        ///     Game state activation handler.
+        /// Game state activation handler.
         /// </summary>
         /// <param name="bundle">Game state parameters.</param>
         public override void Activate(StringVariantMap bundle)
@@ -68,7 +67,7 @@ public override void Activate(StringVariantMap bundle)
         }
 
         /// <summary>
-        ///     Game state deactivation handler.
+        /// Game state deactivation handler.
         /// </summary>
         public override void Deactivate()
         {
@@ -78,7 +77,7 @@ public override void Deactivate()
         }
 
         /// <summary>
-        ///     Key up handler to navigate back in the game state hierarchy.
+        /// Key up handler to navigate back in the game state hierarchy.
         /// </summary>
         /// <param name="args"></param>
         private void HandleKeyUp(VariantMap args)

RbfxTemplate/SettingsMenuState.cs

@@ -21,7 +21,6 @@ public override void OnDataModelInitialized(GameRmlUIComponent menuComponent)
                 val => Settings.MusicVolume = val.Float);
             menuComponent.BindDataModelProperty("effects", val => val.Set(Settings.EffectVolume),
                 val => Settings.EffectVolume = val.Float);
-            //menuComponent.BindDataModelProperty("shadows", val => val.Set(_shadowsQuality), (val) => _shadowsQuality = val.Convert(VariantType.VarInt).Int);
         }
 
         public override void Activate(StringVariantMap bundle)
@@ -40,15 +39,15 @@ public override void Deactivate()
 
         private void OnCancel(VariantList obj)
         {
-            Application.HandleBackKey();
+            Application.ResetSettings();
 
-            //Application.Settings = GameSettings.Load(Context);
+            Application.HandleBackKey();
         }
 
         private void OnApply(VariantList obj)
         {
             Settings.Apply(Context);
-            //Settings.Save(Context);
+            Application.SaveSettings();
 
             Application.HandleBackKey();
         }

RbfxTemplate/StateStack.cs

@@ -34,6 +34,11 @@ public StateStack(StateManager stateManager)
         /// </summary>
         public ApplicationState State => _stack.Count > 0 ? _stack.Peek() : null;
 
+        /// <summary>
+        ///     Number of states in the stack.
+        /// </summary>
+        public int Count => _stack.Count;
+
         /// <summary>
         ///     Push state to the stack and make it current.
         /// </summary>