雲層、使用Wav檔(兔巴哥)

Content/Data/TextureRecs.txt

@@ -22,4 +22,10 @@ Content\Textures\Resources\Start\TextBox-Plus:png:TextBox-Plus:300:50:100:50:3:P
 Content\Textures\Resources\Start\TextBox-Wide:png:TextBox-Wide:421:106:421:106:1:Page;
 Content\Textures\Resources\Start\Back:png:Back:201:51:67:51:3:Scene;
 Content\Textures\Resources\Start\Light:png:Light:35:35:35:35:1:Scene;
-Content\Textures\Resources\Start\Setting:png:Setting:144:72:72:72:2:Scene
+Content\Textures\Resources\Start\Setting:png:Setting:144:72:72:72:2:Scene;
+Content\Textures\Resources\Start\Cloud1:png:Cloud1:663:391:663:391:1:Scene;
+Content\Textures\Resources\Start\Cloud2:png:Cloud2:586:396:586:396:1:Scene;
+Content\Textures\Resources\Start\Cloud3:png:Cloud3:466:351:466:351:1:Scene;
+Content\Textures\Resources\Start\Cloud4:png:Cloud4:663:391:663:391:1:Scene;
+Content\Textures\Resources\Start\Cloud5:png:Cloud5:586:396:586:396:1:Scene;
+Content\Textures\Resources\Start\Cloud6:png:Cloud6:466:351:466:351:1:Scene

WorldOfTheThreeKingdoms/GameManager/CacheManager.cs

@@ -594,7 +594,7 @@ public static void DrawString(SpriteFont font, string text, Vector2 pos, Color c
 
         public static void DrawString(SpriteFont font, string text, Vector2 pos, Color color, float rotation, Vector2 origin, float scale, SpriteEffects effects, float layerDepth, bool checkTradition = false, bool upload = false)
         {
-            if (font != null && !String.IsNullOrEmpty(text))
+            if (!String.IsNullOrEmpty(text))
             {
                 text = CheckTextCache(font, text, checkTradition, upload);
                 //Session.Current.SpriteBatch.DrawString(font, text, pos * Scale, color, rotation, origin, scale * Scale, effects, layerDepth);

WorldOfTheThreeKingdoms/GameManager/Session.cs

@@ -87,8 +87,32 @@ public static GlobalVariables GlobalVariables
         //public Parameters gameParameters = new Parameters();
         //public GlobalVariables globalVariables = new GlobalVariables();
 
-        public static int ResolutionX = 925;
-        public static int ResolutionY = 520;
+        public static int ResolutionX
+        {
+            get
+            {
+                int resolutionX = 0;
+                if (!String.IsNullOrEmpty(Resolution) && Resolution.Contains("*"))
+                {
+                    int.TryParse(Resolution.Split('*')[0].Trim(), out resolutionX);
+                }
+                return resolutionX;
+            }
+        }
+
+        public static int ResolutionY
+        {
+            get
+            {
+                int resolutionY = 0;
+                if (!String.IsNullOrEmpty(Resolution) && Resolution.Contains("*"))
+                {
+                    int.TryParse(Resolution.Split('*')[1].Trim(), out resolutionY);
+                }
+                return resolutionY;
+            }
+        }
+
         public static string Resolution
         {
             get
@@ -99,8 +123,6 @@ public static string Resolution
             {
                 if (!String.IsNullOrEmpty(value) && value.Contains("*"))
                 {
-                    int.TryParse(value.Split('*')[0].Trim(), out ResolutionX);
-                    int.TryParse(value.Split('*')[1].Trim(), out ResolutionY);
                     if (Setting.Current != null)
                     {
                         Setting.Current.Resolution = value;
@@ -132,6 +154,7 @@ public SpriteFont FontE
         {
             get
             {
+                return null;
                 if (fontE == null)
                 {
                     fontE = FontContent.Load<SpriteFont>("FontE");
@@ -148,6 +171,7 @@ public SpriteFont FontL
         {
             get
             {
+                return null;
                 if (fontL == null)
                 {
                     fontL = FontContent.Load<SpriteFont>("FontL");
@@ -164,6 +188,7 @@ public SpriteFont FontS
         {
             get
             {
+                return null;
                 if (fontS == null)
                 {
                     fontS = FontContent.Load<SpriteFont>("FontS");
@@ -180,6 +205,7 @@ public SpriteFont FontT
         {
             get
             {
+                return null;
                 if (fontT == null)
                 {
                     fontT = FontContent.Load<SpriteFont>("FontT");
@@ -196,6 +222,7 @@ public SpriteFont Font
         {
             get
             {
+                return null;
                 if (font == null)
                 {
                     Session.LoadFont(Setting.Current.Language);
@@ -343,7 +370,7 @@ public static void LoadContent(ContentManager content)
             Current.SoundContent = new ContentManager(Current.Content.ServiceProvider, Current.Content.RootDirectory);
             //Current.SoundContent.RootDirectory = "Content";
 
-            LoadFont(Setting.Current.Language);
+            //LoadFont(Setting.Current.Language);
         }
 
         public static void LoadFont(string language)
@@ -394,7 +421,10 @@ public static void ChangeDisplay(bool setScale)
 
             if (Platform.PlatFormType == PlatFormType.Win || Platform.PlatFormType == PlatFormType.Desktop)
             {
-                Session.Resolution = Platform.PreferResolution;
+                if (String.IsNullOrEmpty(Session.Resolution))
+                {
+                    Session.Resolution = Platform.PreferResolution;
+                }
 
                 width = int.Parse(Session.Resolution.Split('*')[0]);
                 height = int.Parse(Session.Resolution.Split('*')[1]);
@@ -407,7 +437,6 @@ public static void ChangeDisplay(bool setScale)
 
                 //InputManager.Scale = new Vector2(screenscalex1, screenscaley1);
 
-                //Platform.SetGraphicsWidthHeight(width, height);
             }
             else if (Platform.PlatFormType == PlatFormType.Android || Platform.PlatFormType == PlatFormType.iOS || Platform.PlatFormType == PlatFormType.UWP)
             {
@@ -454,7 +483,8 @@ public static void ChangeDisplay(bool setScale)
 			//screenScale = screenscalex >= screenscaley ? screenscaley : screenscalex;
 
 			InputManager.Scale1 = new Vector2(screenscalex1, screenscaley1);
-			InputManager.Scale2 = new Vector2(screenscalex2, screenscaley2);
+
+
 			//CoreGame.Current.SpriteScale = Matrix.CreateScale(screenScale, screenScale, 1);
 			//InputManager.Scale = new Vector2(screenScale, screenScale);
 
@@ -470,19 +500,20 @@ public static void ChangeDisplay(bool setScale)
             InputManager.ScaleDraw = new Vector2(1, 1);
             if (setScale)
             {
+                InputManager.Scale2 = new Vector2(screenscalex2, screenscaley2);
                 Session.MainGame.disScale = true;
             }
             else
             {
-                Session.MainGame.disScale = true;
+                Session.MainGame.disScale = false;
             }
 
             Session.MainGame.SpriteScale1 = Matrix.CreateScale(screenscalex1, screenscaley1, 1);
             Session.MainGame.SpriteScale2 = Matrix.CreateScale(screenscalex2, screenscaley2, 1);
 
             Platform.SetGraphicsWidthHeight(width, height);
 
-            //Platform.Current.ProcessViewChanged();
+            Platform.Current.ProcessViewChanged();
 
             Platform.GraphicsApplyChanges();            
 

WorldOfTheThreeKingdoms/GamePlugins/AirViewPlugin/AirView.cs

@@ -304,6 +304,7 @@ private void screen_OnMouseLeftDown(Point position)
                 else if (this.IsMapShowing && StaticMethods.PointInRectangle(position, this.MapPosition))
                 {
                     this.JumpTo(position);
+                    Session.MainGame.mainGameScreen.cloudLayer.Start();
                 }
             }
         }
@@ -328,6 +329,7 @@ private void screen_OnMouseMove(Point position, bool leftDown)
                     if (leftDown)
                     {
                         this.JumpTo(position);
+                        Session.MainGame.mainGameScreen.cloudLayer.Start();
                     }
                     else if (this.isPreparedToJump)
                     {

WorldOfTheThreeKingdoms/GameScreens/MainGameScreen.cs

@@ -77,6 +77,8 @@ public partial class MainGameScreen : Screen
 
         private bool mapEdited = false;
 
+        public CloudLayer cloudLayer;
+
         public MainGameScreen()
             : base()
         {
@@ -110,6 +112,8 @@ public MainGameScreen()
 
             this.screenManager = new ScreenManager();
 
+            this.cloudLayer = new CloudLayer();
+
             //Session.Current.Scenario = new GameScenario(this);
             //this.LoadCommonData();
 
@@ -263,12 +267,14 @@ private void Drawing(GameTime gameTime)            //绘制游戏屏幕
             this.mainMapLayer.Draw(base.viewportSize);
             this.architectureLayer.Draw(base.viewportSize, gameTime);
             this.routewayLayer.Draw(base.viewportSize);
+
+            this.cloudLayer.Draw();
+
             this.tileAnimationLayer.Draw(base.viewportSize);
 
             this.troopLayer.Draw(base.viewportSize, gameTime);
-
-            this.mapVeilLayer.Draw(base.viewportSize);
 
+            this.mapVeilLayer.Draw(base.viewportSize);
 
             switch (base.UndoneWorks.Peek().Kind)
             {
@@ -2770,6 +2776,26 @@ public override void Update(GameTime gameTime)   //视野内容更新
                 this.CalculateFrameRate(gameTime);
                 this.Plugins.PersonBubblePlugin.Update(gameTime);
 
+                if (cloudLayer.IsVisible)
+                {
+                    if (cloudLayer.IsStart)
+                    {
+
+                    }
+                    else
+                    {
+                        if (this.mainMapLayer.DisplayingMapTiles.Exists(ma => ma == null || ma.TileTexture == null))
+                        {
+
+                        }
+                        else
+                        {
+                            cloudLayer.IsStart = true;
+                        }
+                    }
+                    cloudLayer.Update(Convert.ToSingle(gameTime.ElapsedGameTime.TotalSeconds));
+                }
+
                 switch (base.UndoneWorks.Peek().Kind)
                 {
                     case UndoneWorkKind.None: