Merge pull request #1 from luiges90/master

同步耒戈氏的代码
luiges90 · Aug 5, 2013 · c7215e0 · c7215e0
2 parents 28ec28f + a318ccd
commit c7215e0
Show file tree

Hide file tree

Showing 109 changed files with 2,040 additions and 2,762 deletions.
diff --git a/ConfirmationDialogPlugin/ConfirmationDialogPlugin/ConfirmationDialog.cs b/ConfirmationDialogPlugin/ConfirmationDialogPlugin/ConfirmationDialog.cs
@@ -12,7 +12,7 @@ internal class ConfirmationDialog
         internal Point BackgroundSize;
         internal Texture2D BackgroundTexture;
         private Point DisplayOffset;
-        private IPersonTextDialog iPersonTextDialog;
+        private Itupianwenzi iPersonTextDialog;
         private ISimpleTextDialog iSimpleTextDialog;
         private bool isShowing;
         private Texture2D NoDisplayTexture;
@@ -102,7 +102,7 @@ private void screen_OnMouseRightDown(Point position)
             this.IsShowing = false;
         }
 
-        internal void SetPersonTextDialog(IPersonTextDialog iPersonTextDialog)
+        internal void SetPersonTextDialog(Itupianwenzi iPersonTextDialog)
         {
             this.iPersonTextDialog = iPersonTextDialog;
             this.iSimpleTextDialog = null;

diff --git a/ConfirmationDialogPlugin/ConfirmationDialogPlugin/ConfirmationDialogPlugin.cs b/ConfirmationDialogPlugin/ConfirmationDialogPlugin/ConfirmationDialogPlugin.cs
@@ -84,7 +84,7 @@ public void SetGraphicsDevice(GraphicsDevice device)
             this.LoadDataFromXMLDocument(@"GameComponents\ConfirmationDialog\ConfirmationDialogData.xml");
         }
 
-        public void SetPersonTextDialog(IPersonTextDialog iPersonTextDialog)
+        public void SetPersonTextDialog(Itupianwenzi iPersonTextDialog)
         {
             this.confirmationDialog.SetPersonTextDialog(iPersonTextDialog);
         }

diff --git a/DixingBianjiqi/GameTextures.cs b/DixingBianjiqi/GameTextures.cs
@@ -251,7 +251,22 @@ public void LoadTextures(GraphicsDevice device, GameScenario scenario)
                     {
                         animation.Device = device;
                         animation.TextureFileName = "Resources/Effects/TileEffect/" + animation.Name + ".png";
-                        animation.SoundPath = "GameSound/Animation/" + animation.Name + ".wav";
+                        try
+                        {
+                            animation.MaleSoundPath = "GameSound/Animation/Male/" + animation.Name + ".wav";
+                        }
+                        catch
+                        {
+                            animation.MaleSoundPath = "GameSound/Animation/" + animation.Name + ".wav";
+                        }
+                        try
+                        {
+                            animation.FemaleSoundPath = "GameSound/Animation/Female/" + animation.Name + ".wav";
+                        }
+                        catch
+                        {
+                            animation.FemaleSoundPath = "GameSound/Animation/" + animation.Name + ".wav";
+                        }
                     }
                 }
                 catch (Exception exception8)

diff --git a/DixingBianjiqi/zhuyouxipingmu/MGSContextMenu.cs b/DixingBianjiqi/zhuyouxipingmu/MGSContextMenu.cs
@@ -606,6 +606,7 @@ private void HandleContextMenuResult(ContextMenuResult result)
                 case ContextMenuResult.AllEnter:
                     this.CurrentArchitecture.AllEnter();
                     this.Plugins.AirViewPlugin.ReloadTroopView();
+                    this.Scenario.ClearPersonStatusCache();
                     break;
 
                 case ContextMenuResult.DateGo_1Day:

diff --git a/DixingBianjiqi/zhuyouxipingmu/MGSDate.cs b/DixingBianjiqi/zhuyouxipingmu/MGSDate.cs
@@ -81,19 +81,19 @@ private void Date_OnSeasonChange(GameSeason season)
             switch (season)
             {
                 case GameSeason.春:
-                    this.PlayMusic("GameMusic/Spring.wma");
+                    this.PlayMusic("GameMusic/Spring.mp3");
                     break;
 
                 case GameSeason.夏:
-                    this.PlayMusic("GameMusic/Summer.wma");
+                    this.PlayMusic("GameMusic/Summer.mp3");
                     break;
 
                 case GameSeason.秋:
-                    this.PlayMusic("GameMusic/Autumn.wma");
+                    this.PlayMusic("GameMusic/Autumn.mp3");
                     break;
 
                 case GameSeason.冬:
-                    this.PlayMusic("GameMusic/Winter.wma");
+                    this.PlayMusic("GameMusic/Winter.mp3");
                     break;
             }
 

diff --git a/GameFormFramePlugin/GameFormFramePlugin/GameFrame.cs b/GameFormFramePlugin/GameFormFramePlugin/GameFrame.cs
@@ -244,10 +244,6 @@ private void screen_OnMouseLeftDown(Point position)
                         this.CancelButtonState = FrameButtonState.Normal;
                     }
                 }
-                if ((this.frameContent.MapViewSelectorButtonEnabled && StaticMethods.PointInRectangle(position, this.mapviewselectorButtonRectangle)) && (this.frameContent.MapViewSelectorFunction != null))
-                {
-                    this.frameContent.MapViewSelectorFunction();
-                }
             }
         }
 
@@ -275,6 +271,10 @@ private void screen_OnMouseLeftUp(Point position)
                     this.Result = FrameResult.Cancel;
                     this.IsShowing = false;
                 }
+                if ((this.frameContent.MapViewSelectorButtonEnabled && StaticMethods.PointInRectangle(position, this.mapviewselectorButtonRectangle)) && (this.frameContent.MapViewSelectorFunction != null))
+                {
+                    this.frameContent.MapViewSelectorFunction();
+                }
             }
         }