Merge branch 'master' of https://github.com/kiletw/SpineViewerWPF

# Conflicts:
#	SpineViewerWPF/PublicFunction/Player/Player_2_1_08.cs
#	SpineViewerWPF/PublicFunction/Player/Player_2_1_25.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_1_07.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_4_02.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_5_51.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_6_32.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_6_53.cs
#	SpineViewerWPF/PublicFunction/Player/Player_3_7_83.cs

Author: kiletw

SpineViewerWPF/MainWindow.xaml.cs

@@ -106,9 +106,8 @@ public static void SetCBAnimeName()
         {
             for (int i = 0; i < App.GV.AnimeList.Count; i++)
             {
-                MasterMain.cb_AnimeList.Items.Add(App.GV.AnimeList[i]);
+               MasterMain.cb_AnimeList.Items.Add(App.GV.AnimeList[i]);
             }
-
             for (int i = 0; i < App.GV.SkinList.Count; i++)
             {
                 MasterMain.cb_SkinList.Items.Add(App.GV.SkinList[i]);
@@ -206,30 +205,43 @@ private void loadFileToolStripMenuItem_Click(object sender, RoutedEventArgs e)
                 MasterMain.cb_SkinList.Items.Clear();
                 if (Player.Content != null)
                 {
-                    App.isNew = true;
-                    App.AppXC.ContentManager.Dispose();
-                    App.AppXC.Initialize = null;
-                    App.AppXC.Update = null;
-                    App.AppXC.LoadContent = null;
-                    App.AppXC.Draw = null;
-                    btn_PlayControl.Content = this.FindResource("img_pause");
-
-                    DependencyObject xnaParent = ((UserControl)Player.Content).Parent;
-                    if (xnaParent != null)
+                    if(App.GV.SpineVersion != cb_Version.SelectionBoxItem.ToString())
                     {
-                        xnaParent.SetValue(ContentPresenter.ContentProperty, null);
+                        App.GV.SpineVersion = cb_Version.SelectionBoxItem.ToString();
+                        App.isNew = true;
+                        App.AppXC.ContentManager.Dispose();
+                        App.AppXC.Initialize = null;
+                        App.AppXC.Update = null;
+                        App.AppXC.LoadContent = null;
+                        App.AppXC.Draw = null;
+                        btn_PlayControl.Content = this.FindResource("img_pause");
+
+                        DependencyObject xnaParent = ((UserControl)Player.Content).Parent;
+                        if (xnaParent != null)
+                        {
+                            xnaParent.SetValue(ContentPresenter.ContentProperty, null);
+                        }
+                        Canvas oldCanvas = (Canvas)App.AppXC.Parent;
+                        if (oldCanvas != null)
+                        {
+                            oldCanvas.Children.Clear();
+                        }
+                        Player.Content = null;
+                        UC_Player = new UCPlayer();
+                        Player.Content = UC_Player;
                     }
-                    Canvas oldCanvas = (Canvas)App.AppXC.Parent;
-                    if (oldCanvas != null)
+                    else
                     {
-                        oldCanvas.Children.Clear();
+                        UC_Player.Reload();
                     }
-                    Player.Content = null;
-                    UC_Player = null;
                 }
-                App.GV.SpineVersion = cb_Version.SelectionBoxItem.ToString();
-                UC_Player = new UCPlayer();
-                Player.Content = UC_Player;
+                else
+                {
+                    App.GV.SpineVersion = cb_Version.SelectionBoxItem.ToString();
+                    UC_Player = new UCPlayer();
+                    Player.Content = UC_Player;
+                }
+            
 
             }
         }

SpineViewerWPF/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // 您可以指定所有的值，或將組建編號或修訂編號設為預設值
 // 指定為預設值: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]

SpineViewerWPF/PublicFunction/Player/Player_3_6_39.cs

@@ -14,8 +14,6 @@ public class Player_3_6_39 : IPlayer
     private Skeleton skeleton;
     private AnimationState state;
     private SkeletonRenderer skeletonRenderer;
-    private ExposedList<Animation> listAnimation;
-    private ExposedList<Skin> listSkin;
     private Atlas atlas;
     private SkeletonData skeletonData;
     private AnimationStateData stateData;
@@ -59,21 +57,8 @@ public void LoadContent(ContentManager contentManager)
 
         state = new AnimationState(stateData);
 
-        List<string> AnimationNames = new List<string>();
-        listAnimation = state.Data.skeletonData.Animations;
-        foreach (Animation An in listAnimation)
-        {
-            AnimationNames.Add(An.name);
-        }
-        App.GV.AnimeList = AnimationNames;
-
-        List<string> SkinNames = new List<string>();
-        listSkin = state.Data.skeletonData.Skins;
-        foreach (Skin Sk in listSkin)
-        {
-            SkinNames.Add(Sk.name);
-        }
-        App.GV.SkinList = SkinNames;
+        App.GV.AnimeList = state.Data.skeletonData.Animations.Select(x => x.Name).ToList();
+        App.GV.SkinList = state.Data.skeletonData.Skins.Select(x => x.Name).ToList();
 
         if (App.GV.SelectAnimeName != "")
         {

SpineViewerWPF/Views/UCPlayer.xaml.cs

@@ -121,5 +121,26 @@ public void ChangeSet()
         {
             player.ChangeSet();
         }
+
+        public void Reload()
+        {
+            Frame.Children.Remove(App.AppXC);
+            App.AppXC.Initialize -= player.Initialize;
+            App.AppXC.Update -= player.Update;
+            App.AppXC.LoadContent -= player.LoadContent;
+            App.AppXC.Draw -= player.Draw;
+
+
+            App.AppXC.Initialize += player.Initialize;
+            App.AppXC.Update += player.Update;
+            App.AppXC.LoadContent += player.LoadContent;
+            App.AppXC.Draw += player.Draw;
+            App.AppXC.Width = App.GV.FrameWidth;
+            App.AppXC.Height = App.GV.FrameHeight;
+
+            Frame.Children.Add(App.AppXC);
+            player.ChangeSet();
+            MainWindow.SetCBAnimeName();
+        }
     }
 }