fix use hero res not work

Author: vinaghost

MainCore/Tasks/Sim/UpgradeBuilding.cs

@@ -175,7 +175,7 @@ private void UpgradeAds(PlanTask buildingTask)
                 var nodeNotShowAgainConfirm = html.DocumentNode.SelectSingleNode("//input[@name='adSalesVideoInfoScreen']");
                 if (nodeNotShowAgainConfirm is not null)
                 {
-                    var elements = chrome.FindElements(By.XPath(nodeNotShowAgainConfirm.XPath));
+                    var elements = chrome.FindElements(By.XPath(nodeNotShowAgainConfirm.ParentNode.XPath));
                     elements[0].Click();
                     chrome.ExecuteScript("jQuery(window).trigger('showVideoWindowAfterInfoScreen')");
                 }
@@ -229,23 +229,19 @@ private void UpgradeAds(PlanTask buildingTask)
 
             {
                 var wait = _chromeBrowser.GetWait();
-                try
-                {
-                    wait.Until(driver => driver.Url.Contains("dorf"));
-                    wait.Until(driver => ((IJavaScriptExecutor)driver).ExecuteScript("return document.readyState").Equals("complete"));
-                }
-                catch
+                wait.Until(driver => driver.Url.Contains("dorf"));
+                wait.Until(driver => ((IJavaScriptExecutor)driver).ExecuteScript("return document.readyState").Equals("complete"));
+
+                html = _chromeBrowser.GetHtml();
+                if (html.GetElementbyId("dontShowThisAgain") is not null)
                 {
-                    html = _chromeBrowser.GetHtml();
-                    if (html.GetElementbyId("dontShowThisAgain") is not null)
-                    {
-                        var dontshowthisagain = chrome.FindElements(By.Id("dontShowThisAgain"));
-                        dontshowthisagain[0].Click();
-                        Thread.Sleep(800);
-                        var dialogbuttonok = chrome.FindElements(By.ClassName("dialogButtonOk"));
-                        dialogbuttonok[0].Click();
-                    }
+                    var dontshowthisagain = chrome.FindElements(By.Id("dontShowThisAgain"));
+                    dontshowthisagain[0].Click();
+                    Thread.Sleep(800);
+                    var dialogbuttonok = chrome.FindElements(By.ClassName("dialogButtonOk"));
+                    dialogbuttonok[0].Click();
                 }
+
             }
         }
 

TravianOfficialNewHeroUICore/FindElements/HeroPage.cs

@@ -33,7 +33,7 @@ public static HtmlNode GetItemSlot(HtmlDocument doc, int type)
 
             foreach (var itemSlot in heroItemDivs)
             {
-                if (itemSlot.ChildNodes.Count != 2) continue;
+                if (itemSlot.ChildNodes.Count < 2) continue;
                 var itemNode = itemSlot.ChildNodes[1];
                 var classes = itemNode.GetClasses();
                 if (classes.Count() != 2) continue;
@@ -43,7 +43,7 @@ public static HtmlNode GetItemSlot(HtmlDocument doc, int type)
                 var itemValueStr = new string(itemValue.Where(c => char.IsDigit(c)).ToArray());
                 if (string.IsNullOrEmpty(itemValueStr)) continue;
 
-                if (int.Parse(itemValueStr) == type) return itemNode;
+                if (int.Parse(itemValueStr) == type) return itemSlot;
             }
             return null;
         }

TravianOfficialNewHeroUICore/Parsers/HeroInfo.cs

@@ -61,7 +61,7 @@ public static int GetAdventureNum(HtmlDocument doc)
 
             foreach (var itemSlot in heroItemDivs)
             {
-                if (itemSlot.ChildNodes.Count != 2) continue;
+                if (itemSlot.ChildNodes.Count < 2) continue;
                 var itemNode = itemSlot.ChildNodes[1];
                 var classes = itemNode.GetClasses();
                 if (classes.Count() != 2) continue;
@@ -74,7 +74,7 @@ public static int GetAdventureNum(HtmlDocument doc)
 
                 if (itemSlot.GetAttributeValue("data-tier", "").Contains("consumable"))
                 {
-                    if (itemSlot.ChildNodes.Count != 3)
+                    if (itemSlot.ChildNodes.Count < 3)
                     {
                         heroItems.Add((int.Parse(itemValueStr), 1));
                         continue;