Merge pull request #21 from way-zer/fix-exFactoryNotConsume

修复逻辑绘图中content图标丢失
way-zer · Mar 1, 2022 · ec159ca · ec159ca
2 parents 340bd89 + 5ecd386
commit ec159ca
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/core/src/cf/wayzer/ContentsLoader.kt b/core/src/cf/wayzer/ContentsLoader.kt
@@ -1,5 +1,6 @@
 package cf.wayzer
 
+import arc.Core
 import arc.Events
 import arc.files.Fi
 import arc.func.Cons
@@ -8,10 +9,7 @@ import arc.struct.Seq
 import mindustry.Vars
 import mindustry.content.*
 import mindustry.core.ContentLoader
-import mindustry.ctype.Content
-import mindustry.ctype.ContentList
-import mindustry.ctype.ContentType
-import mindustry.ctype.MappableContent
+import mindustry.ctype.*
 import mindustry.game.EventType
 import mindustry.io.SaveVersion
 import mindustry.logic.LExecutor
@@ -207,6 +205,16 @@ object ContentsLoader : ContentLoader() {
                 doMeasureTimeLog("Vars.schematics.load") {
                     Vars.schematics.load()
                 }
+                doMeasureTimeLog("Set UnlockableContent.iconId") {
+                    //copy from mindustry.ui.Fonts.loadContentIcons
+                    var lastCid = 1
+                    each {
+                        if (it is UnlockableContent && Core.atlas.find(it.name + "-icon-logic").found()) {
+                            it.iconId = lastCid
+                            lastCid++
+                        }
+                    }
+                }
             }
         }