Merge pull request #120 from /issues/118

Issues/118 Optimize StateEditor
mattak · Oct 29, 2017 · 7cc805d · 7cc805d
2 parents ec29ec2 + 04817a3
commit 7cc805d
Show file tree

Hide file tree

Showing 12 changed files with 759 additions and 409 deletions.
diff --git a/Assets/Plugins/Unidux/Examples/Middlewares/Scripts/Unidux.cs b/Assets/Plugins/Unidux/Examples/Middlewares/Scripts/Unidux.cs
@@ -3,7 +3,7 @@
 
 namespace Unidux.Example.Middlewares
 {
-    public class Unidux : SingletonMonoBehaviour<Unidux>
+    public class Unidux : SingletonMonoBehaviour<Unidux>, IStoreAccessor
     {
         public TextAsset InitialStateJson;
 

diff --git a/Assets/Plugins/Unidux/Examples/SceneTransition/Scripts/PageTitleRenderer.cs b/Assets/Plugins/Unidux/Examples/SceneTransition/Scripts/PageTitleRenderer.cs
@@ -19,7 +19,7 @@ void Start()
 
         void Render(State state)
         {
-            this.GetComponent<Text>().text = state.Page.CurrentPage.ToString();
+            this.GetComponent<Text>().text = state.Page.Current.Page.ToString();
         }
     }
 }
diff --git a/Assets/Plugins/Unidux/Examples/SceneTransition/Scripts/PageWatcher.cs b/Assets/Plugins/Unidux/Examples/SceneTransition/Scripts/PageWatcher.cs
@@ -20,7 +20,7 @@ void Start()
 
         void UpdateScene(State state)
         {
-            if (state.Scene.NeedsAdjust(config.GetPageScenes(), config.PageMap[state.Page.CurrentPage]))
+            if (state.Scene.NeedsAdjust(config.GetPageScenes(), config.PageMap[state.Page.Current.Page]))
             {
                 Unidux.Dispatch(PageDuck<Page, Scene>.ActionCreator.Adjust());
             }

diff --git a/Assets/Plugins/Unidux/Examples/SimpleHttp/Scripts/State.cs b/Assets/Plugins/Unidux/Examples/SimpleHttp/Scripts/State.cs
@@ -8,24 +8,5 @@ public partial class State : StateBase
         public string Url = "";
         public int StatusCode = -1;
         public string Body = "";
-
-        public override bool Equals(object obj)
-        {
-            if (obj is State)
-            {
-                var target = (State) obj;
-                return
-                    this.Url == target.Url &&
-                    this.StatusCode == target.StatusCode &&
-                    this.Body == target.Body;
-            }
-
-            return false;
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
     }
 }