Update 2.5.7

Awbugl · Awbugl · commit 92c54321e149 · 2023-02-08T11:01:41.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+- v2.5.7
+  + 修复部分图标缺失的问题
+
+  + Fix the problem of missing icons
+
+<details>
+  <summary>点击展开日志 | Click to view all </summary>
+
 - v2.5.6
   + 调整部分图标
   + 调整部分文案
@@ -13,8 +21,6 @@
   + Adjust the storage capacity and charging power of Logistics Station
   + Add recipe: Glycerol Synthesis
 
-<details>
-  <summary>点击展开日志 | Click to view all </summary>
 
 - v2.5.5
   + 调整部分图标
diff --git a/ProjectGenesis.csproj b/ProjectGenesis.csproj
@@ -127,12 +127,12 @@
         <Compile Include="src\Patches\UI\MultiProductionPatches.cs" />
         <Compile Include="src\Patches\UI\UIAbnormalityTipPatches.cs" />
         <Compile Include="src\Patches\UI\UIPatches.cs" />
-        <Compile Include="src\Patches\UI\UIPlanetFocus\MyWindowCtl.cs" />
         <Compile Include="src\Patches\UI\UIPlanetFocus\UIPlanetFocusWindow.cs" />
         <Compile Include="src\Patches\UI\UIPlanetFocus\UIPlanetDetailExpand.cs" />
-        <Compile Include="src\Patches\UI\UIPlanetFocus\Util.cs" />
         <Compile Include="src\Patches\UI\UISignalPickerPatches.cs" />
         <Compile Include="src\Patches\UI\UpdateLogoPatches.cs" />
+        <Compile Include="src\Patches\UI\Utils\MyWindowCtl.cs" />
+        <Compile Include="src\Patches\UI\Utils\Util.cs" />
         <Compile Include="src\ProjectGenesis.cs" />
         <Compile Include="src\Utils\CopyModelUtils.cs" />
         <Compile Include="src\Utils\ERecipeType.cs" />
diff --git a/dependencies/items.json b/dependencies/items.json
@@ -7976,7 +7976,7 @@
     "ID": 7002,
     "Name": "氨",
     "Description": "I氨",
-    "IconPath": "Assets/texpack/氨_新",
+    "IconPath": "Assets/texpack/氨",
     "GridIndex": 4113,
     "StackSize": 20,
     "Type": 2,
diff --git a/dependencies/recipes.json b/dependencies/recipes.json
@@ -3601,7 +3601,7 @@
     "ID": 710,
     "Name": "合成氨",
     "Description": "R合成氨",
-    "IconPath": "Assets/texpack/氨_新",
+    "IconPath": "Assets/texpack/氨",
     "Type": 2,
     "GridIndex": 4113,
     "Time": 120,
diff --git a/src/Patches/UI/DisplayTextPatches/DisplayTextPatches.cs b/src/Patches/UI/DisplayTextPatches/DisplayTextPatches.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using ProjectGenesis.Utils;
 using UnityEngine;
+using Utils_ERecipeType = ProjectGenesis.Utils.ERecipeType;
 
 // ReSharper disable InconsistentNaming
 
@@ -13,35 +14,35 @@ internal static class DisplayTextPatches
         [HarmonyPatch(typeof(RecipeProto), "madeFromString", MethodType.Getter)]
         public static void RecipeProto_madeFromString(ref RecipeProto __instance, ref string __result)
         {
-            var type = (Utils.ERecipeType)__instance.Type;
+            var type = (Utils_ERecipeType)__instance.Type;
 
             switch (type)
             {
-                case Utils.ERecipeType.电路蚀刻:
+                case Utils_ERecipeType.电路蚀刻:
                     __result = "电路蚀刻机".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.高精度加工:
+                case Utils_ERecipeType.高精度加工:
                     __result = "高精度装配线".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.矿物处理:
+                case Utils_ERecipeType.矿物处理:
                     __result = "矿物处理厂".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.精密组装:
+                case Utils_ERecipeType.精密组装:
                     __result = "精密制造厂".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.聚变生产:
+                case Utils_ERecipeType.聚变生产:
                     __result = "紧凑式回旋加速器".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.垃圾回收:
+                case Utils_ERecipeType.垃圾回收:
                     __result = "物质分解设施".TranslateFromJson();
                     break;
 
-                case Utils.ERecipeType.高分子化工:
+                case Utils_ERecipeType.高分子化工:
                     __result = "先进化学反应釜".TranslateFromJson();
                     break;
             }
@@ -102,7 +103,7 @@ public static void GetPropValuePatch(ref ItemProto __instance, int index, ref st
                     if (__instance.prefabDesc.isCollectStation && __instance.ID == ProtoIDUsedByPatches.I大气采集器) __result = "行星大气".TranslateFromJson();
 
                     return;
-                
+
                 case 22:
                     if (GameMain.history.TechUnlocked(ProtoIDUsedByPatches.T化工技术革新) && __instance.prefabDesc.isAssembler)
                         switch (__instance.prefabDesc.modelIndex)
diff --git a/src/Patches/UI/UIPlanetFocus/UIPlanetDetailExpand.cs b/src/Patches/UI/UIPlanetFocus/UIPlanetDetailExpand.cs
@@ -1,4 +1,5 @@
 ﻿using HarmonyLib;
+using ProjectGenesis.Patches.UI.Utils;
 using ProjectGenesis.Utils;
 
 // ReSharper disable InconsistentNaming
diff --git a/src/Patches/UI/UIPlanetFocus/UIPlanetFocusWindow.cs b/src/Patches/UI/UIPlanetFocus/UIPlanetFocusWindow.cs
@@ -1,9 +1,12 @@
 ﻿using CommonAPI.Systems;
 using HarmonyLib;
+using ProjectGenesis.Patches.UI.Utils;
 using ProjectGenesis.Utils;
 using UnityEngine;
 using UnityEngine.UI;
 using static ProjectGenesis.Patches.Logic.PlanetFocus.PlanetFocusPatches;
+using static ProjectGenesis.Patches.UI.Utils.Util;
+using static ProjectGenesis.Patches.UI.Utils.MyWindowCtl;
 
 namespace ProjectGenesis.Patches.UI.UIPlanetFocus
 {
@@ -29,15 +32,15 @@ public class UIPlanetFocusWindow : ManualBehaviour
 
         internal static UIPlanetFocusWindow CreateWindow()
         {
-            var win = MyWindowCtl.CreateWindow<UIPlanetFocusWindow>("UIPlanetFocusWindow", "星球基地".TranslateFromJson());
+            var win = CreateWindow<UIPlanetFocusWindow>("UIPlanetFocusWindow", "星球基地".TranslateFromJson());
             return win;
         }
 
         public void OpenWindow() => MyWindowCtl.OpenWindow(this);
 
         protected override void _OnCreate()
         {
-            windowTrans = MyWindowCtl.GetRectTransform(this);
+            windowTrans = GetRectTransform(this);
             windowTrans.sizeDelta = new Vector2(380f, 250f);
 
             CreateUI();
@@ -47,25 +50,25 @@ private void CreateUI()
         {
             var tab = new GameObject();
             _tab1 = tab.AddComponent<RectTransform>();
-            Util.NormalizeRectWithMargin(_tab1, 40, 40, 40, 40, windowTrans);
+            NormalizeRectWithMargin(_tab1, 40, 40, 40, 40, windowTrans);
             tab.name = "tab-1";
 
-            nameText = Util.CreateText("星球倾向", 16);
-            Util.NormalizeRectWithTopLeft(nameText.transform, 0f, 20f, _tab1);
+            nameText = CreateText("星球倾向", 16);
+            NormalizeRectWithTopLeft(nameText.transform, 0f, 20f, _tab1);
 
             for (var i = 0; i < FocusMaxCount; ++i)
             {
-                Util.CreateSignalIcon(out var iconBtn, out var iconImage);
+                CreateSignalIcon(out var iconBtn, out var iconImage);
                 _iconBtns[i] = iconBtn;
                 _iconImgs[i] = iconImage;
-                _iconTexts[i] = Util.CreateText("", 16);
+                _iconTexts[i] = CreateText("", 16);
 
                 // works for 2x2
                 // Util.NormalizeRectWithTopLeft(iconBtn.transform, (i & 1) * 60, 60 + (i >> 1) * 60, _tab1);
                 // Util.NormalizeRectWithTopLeft(_iconTexts[i].transform, 150, 60 + i * 30, _tab1);
 
-                Util.NormalizeRectWithTopLeft(iconBtn.transform, 0, 60 + i * 60, _tab1);
-                Util.NormalizeRectWithTopLeft(_iconTexts[i].transform, 55, 72 + i * 60, _tab1);
+                NormalizeRectWithTopLeft(iconBtn.transform, 0, 60 + i * 60, _tab1);
+                NormalizeRectWithTopLeft(_iconTexts[i].transform, 55, 72 + i * 60, _tab1);
 
                 var id = i;
                 iconBtn.onClick += _ => OnIconBtnClick(id);
diff --git a/src/Patches/UI/Utils/MyWindowCtl.cs b/src/Patches/UI/Utils/MyWindowCtl.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEngine;
 using UnityEngine.UI;
 
-namespace ProjectGenesis.Patches.UI.UIPlanetFocus
+namespace ProjectGenesis.Patches.UI.Utils
 {
     /// <summary>
     ///   special thanks to https://github.com/hetima/DSP_PlanetFinder/tree/main/PlanetFinder
diff --git a/src/Patches/UI/Utils/Util.cs b/src/Patches/UI/Utils/Util.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ProjectGenesis.Patches.UI.UIPlanetFocus
+namespace ProjectGenesis.Patches.UI.Utils
 {
     /// <summary>
     ///   special thanks to https://github.com/hetima/DSP_PlanetFinder/tree/main/PlanetFinder
diff --git a/src/ProjectGenesis.cs b/src/ProjectGenesis.cs
@@ -43,7 +43,7 @@ public class ProjectGenesis : BaseUnityPlugin, IModCanSave, IMultiplayerModWithS
     {
         public const string MODGUID = "org.LoShin.GenesisBook";
         public const string MODNAME = "GenesisBook";
-        public const string VERSION = "2.5.6";
+        public const string VERSION = "2.5.7";
 
         public string Version => VERSION;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using HarmonyLib;`
	`2`	`+using ProjectGenesis.Patches.UI.Utils;`
`2`	`3`	`using ProjectGenesis.Utils;`
`3`	`4`
`4`	`5`	`// ReSharper disable InconsistentNaming`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using UnityEngine.UI;`
`3`	`3`
`4`		`-namespace ProjectGenesis.Patches.UI.UIPlanetFocus`
	`4`	`+namespace ProjectGenesis.Patches.UI.Utils`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// special thanks to https://github.com/hetima/DSP_PlanetFinder/tree/main/PlanetFinder`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using UnityEngine;`
`3`	`3`	`using UnityEngine.UI;`
`4`	`4`
`5`		`-namespace ProjectGenesis.Patches.UI.UIPlanetFocus`
	`5`	`+namespace ProjectGenesis.Patches.UI.Utils`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// special thanks to https://github.com/hetima/DSP_PlanetFinder/tree/main/PlanetFinder`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class ProjectGenesis : BaseUnityPlugin, IModCanSave, IMultiplayerModWithS`
`43`	`43`	`{`
`44`	`44`	`public const string MODGUID = "org.LoShin.GenesisBook";`
`45`	`45`	`public const string MODNAME = "GenesisBook";`
`46`		`- public const string VERSION = "2.5.6";`
	`46`	`+ public const string VERSION = "2.5.7";`
`47`	`47`
`48`	`48`	`public string Version => VERSION;`
`49`	`49`