diff --git a/Content/Data/GameParameters.xml b/Content/Data/GameParameters.xml
index 5c324e730..1fa506e09 100644
--- a/Content/Data/GameParameters.xml
+++ b/Content/Data/GameParameters.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WorldOfTheThreeKingdoms.Android/Resources/Resource.Designer.cs b/WorldOfTheThreeKingdoms.Android/Resources/Resource.Designer.cs
index 4acd480da..0998e86a4 100644
--- a/WorldOfTheThreeKingdoms.Android/Resources/Resource.Designer.cs
+++ b/WorldOfTheThreeKingdoms.Android/Resources/Resource.Designer.cs
@@ -1,11 +1,10 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
//
-// 這段程式碼是由工具產生的。
-// 執行階段版本:4.0.30319.42000
+// This code was generated by a tool.
//
-// 對這個檔案所做的變更可能會造成錯誤的行為,而且如果重新產生程式碼,
-// 變更將會遺失。
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
//
//------------------------------------------------------------------------------
@@ -15,7 +14,7 @@ namespace WorldOfTheThreeKingdoms.Android
{
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")]
public partial class Resource
{
@@ -44,11 +43,11 @@ private Attribute()
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int Icon = 2130837504;
+ // aapt resource value: 0x7F010000
+ public const int Icon = 2130771968;
- // aapt resource value: 0x7f020001
- public const int Splash = 2130837505;
+ // aapt resource value: 0x7F010001
+ public const int Splash = 2130771969;
static Drawable()
{
@@ -63,11 +62,11 @@ private Drawable()
public partial class String
{
- // aapt resource value: 0x7f030001
- public const int ApplicationName = 2130903041;
+ // aapt resource value: 0x7F020000
+ public const int ApplicationName = 2130837504;
- // aapt resource value: 0x7f030000
- public const int Hello = 2130903040;
+ // aapt resource value: 0x7F020001
+ public const int Hello = 2130837505;
static String()
{
@@ -82,8 +81,8 @@ private String()
public partial class Style
{
- // aapt resource value: 0x7f040000
- public const int Theme_Splash = 2130968576;
+ // aapt resource value: 0x7F030000
+ public const int Theme_Splash = 2130903040;
static Style()
{
diff --git a/WorldOfTheThreeKingdoms.UWP/WorldOfTheThreeKingdoms.UWP.csproj b/WorldOfTheThreeKingdoms.UWP/WorldOfTheThreeKingdoms.UWP.csproj
index e1fe9aa84..965d843f6 100644
--- a/WorldOfTheThreeKingdoms.UWP/WorldOfTheThreeKingdoms.UWP.csproj
+++ b/WorldOfTheThreeKingdoms.UWP/WorldOfTheThreeKingdoms.UWP.csproj
@@ -11,8 +11,8 @@
WorldOfTheThreeKingdoms.UWP
en-US
UAP
- 10.0.17763.0
- 10.0.10586.0
+ 10.0.22000.0
+ 10.0.22000.0
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -4486,7 +4486,6 @@
Content\Data\Scenario\40WJQXGJ7.json
PreserveNewest
-
Content\Data\Scenario\Scenarios.json
PreserveNewest
diff --git a/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs b/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs
index 8d68b1f74..40eee427d 100644
--- a/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs
+++ b/WorldOfTheThreeKingdoms/GameObjects/Architecture.cs
@@ -15022,7 +15022,7 @@ public PersonList nvxingwujiang()
nvxingwujiangliebiao.Add(person);
}
}
-- foreach (Captive c in this.Captives)
+ foreach (Captive c in this.Captives)
{
Person person = c.CaptivePerson;
if (person.ArrivingDays > 0) continue;
diff --git a/WorldOfTheThreeKingdoms/GameScreens/MainMenuScreen.cs b/WorldOfTheThreeKingdoms/GameScreens/MainMenuScreen.cs
index 3ec025553..95a661f8e 100644
--- a/WorldOfTheThreeKingdoms/GameScreens/MainMenuScreen.cs
+++ b/WorldOfTheThreeKingdoms/GameScreens/MainMenuScreen.cs
@@ -1070,7 +1070,7 @@ public MainMenuScreen()
Unit = 1
};
- nstGeneralChildsMax = new NumericSetTextureF(1, 100, 100, null, new Vector2(left1 + 220, heightBase + height * 4.5f), true)
+ nstGeneralChildsMax = new NumericSetTextureF(1, 1000, 1000, null, new Vector2(left1 + 220, heightBase + height * 4.5f), true)
{
IntMode = true,
DisNumber = false,