修复舰娘改造判断 Bug

忘了加否定……
Yoctillion · Mar 2, 2016 · a2178c0 · a2178c0
1 parent e4ac4ba
commit a2178c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/RemodelHelper/Plugin.cs b/RemodelHelper/Plugin.cs
@@ -12,7 +12,7 @@ namespace RemodelHelper
     [Export(typeof(IPlugin))]
     [ExportMetadata("Title", "改修助手")]
     [ExportMetadata("Description", "改修工厂辅助插件")]
-    [ExportMetadata("Version", "1.1.1")]
+    [ExportMetadata("Version", "1.1.2")]
     [ExportMetadata("Author", "Yoctillion")]
     [ExportMetadata("Guid", "71C1EE7A-A153-437F-B75F-E3E22ED833F1")]
     public class Plugin : ITool, IPlugin

diff --git a/RemodelHelper/Properties/AssemblyInfo.cs b/RemodelHelper/Properties/AssemblyInfo.cs
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
diff --git a/RemodelHelper/ViewModels/DetailViewModel.cs b/RemodelHelper/ViewModels/DetailViewModel.cs
@@ -287,9 +287,12 @@ protected override bool FilterAssistant(BaseSlotItemInfo baseSlotItem, UpgradeSl
                     var set = new HashSet<int>();
                     while (client.Homeport.Organization.Ships.Values.All(ship => ship.Info.Id != shipId))
                     {
+                        // 改造链循环（如霞改二/乙）
+                        if (!set.Add(shipId)) return false;
+
                         int.TryParse(client.Master.Ships[shipId].RawData.api_aftershipid, out shipId);
-                        // 没有后续改造舰娘 or 循环（如霞改二/乙）
-                        if (shipId == 0 || set.Add(shipId)) return false;
+                        // 没有后续改造舰娘
+                        if (shipId == 0) return false;
                     }
                 }
             }