Merge branch 'master' of https://github.com/veigr/EventMapHpViewer

veigr · Oct 7, 2016 · 69d53eb · 69d53eb
2 parents 4848e4c + 24703a6
commit 69d53eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/EventMapHpViewer/Models/MapInfoProxy.cs b/EventMapHpViewer/Models/MapInfoProxy.cs
@@ -46,11 +46,11 @@ public MapInfoProxy()
 
             proxy.ApiSessionSource
                 .Where(s => s.Request.PathAndQuery == "/kcsapi/api_get_member/mapinfo")
-                .TryParse<member_mapinfo[]>()
+                .TryParse<mapinfo>()
                 .Subscribe(m =>
                 {
                     Debug.WriteLine("MapInfoProxy - member_mapinfo");
-                    this.Maps.MapList = this.CreateMapList(m.Data);
+                    this.Maps.MapList = this.CreateMapList(m.Data.api_map_info);
                     this.RaisePropertyChanged(() => this.Maps);
                 });
 

diff --git a/EventMapHpViewer/Models/Raw/member_mapinfo.cs b/EventMapHpViewer/Models/Raw/member_mapinfo.cs
@@ -1,5 +1,10 @@
 namespace EventMapHpViewer.Models.Raw
 {
+    public class mapinfo
+    {
+        public member_mapinfo[] api_map_info { get; set; }
+    }
+
     public class member_mapinfo
     {
         public int api_id { get; set; }
@@ -8,5 +13,4 @@ public class member_mapinfo
         public int api_defeat_count { get; set; }
         public Api_Eventmap api_eventmap { get; set; }
     }
-
 }