فهرست منبع

套装图集补充提交

zhangyuqian 1 سال پیش
والد
کامیت
d95e3f714b

+ 6 - 1
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -24,7 +24,9 @@ namespace GFGEditor
         public static string ChapterGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
         public static string ChapterGuideIconMd5FileSaveName = "ChapterGuideIconMd5";
 
-
+        private static string[] StoryGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/故事图鉴" }; } }
+        public static string StoryGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
+        public static string StoryGuideIconMd5FileSaveName = "StoryGuideIconMd5";
         private static string[] MusicSrcPaths { get { return new string[] { ResRootPath + "music/" }; } }
         public static string MusicTargetPath = $"{ResPathUtil.MUSIC_DIR_PATH}/";
         public static string MusicMd5FileSaveName = "MusicMd5";
@@ -202,6 +204,9 @@ namespace GFGEditor
             //博物图鉴图标
             EditorUtility.DisplayProgressBar("进度", "正在导入博物图鉴图标", 1);
             ImportRes(ChapterGuideIconSrcPaths, ChapterGuideIconTargetPath, ChapterGuideIconMd5FileSaveName);
+            //故事图鉴图标
+            EditorUtility.DisplayProgressBar("进度", "正在导入故事图鉴图标", 1);
+            ImportRes(StoryGuideIconSrcPaths, StoryGuideIconTargetPath, StoryGuideIconMd5FileSaveName);
             //物品图标
             EditorUtility.DisplayProgressBar("进度", "正在导入物品图标", 1);
             ImportRes(ItemIconSrcPaths, ItemIconTargetPath, IconMd5FileSaveName);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/TimeTracingDataManager.cs

@@ -7,7 +7,7 @@ namespace GFGGame
 {
     public class TimeTracingDataManager : SingletonBase<TimeTracingDataManager>
     {
-        public List<int> IdList = new List<int>() { 5017, 5018, 5019 };
+        public List<int> IdList = new List<int>() { 5017, 5018 };
         public List<int> chapterIdList = new List<int>();
         //时光回溯,关卡编号
         public static int _currentChapterId = 62001;

+ 11 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private int _suitTypeId;
         private Dictionary<int, EffectUI> _effectUIDic = new Dictionary<int, EffectUI>();
         private int index = 0;
+        private Dictionary<int, string> IdToImageDic = new Dictionary<int, string> {[201024] = "changxiawuj",[201025] = "xiangfengmr" };
         public override void Dispose()
         {
             foreach (var v in _effectUIDic)
@@ -188,7 +189,16 @@ namespace GFGGame
             }
 
             listItem.m_txtName.text = suitCfg.name;
-            listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
+            string imageName;
+            if (IdToImageDic.ContainsKey(suitId))
+            {
+                imageName = IdToImageDic[suitId];
+            }
+            else
+            {
+                imageName = suitCfg.res;
+            }
+            listItem.m_loaderPic.url = ResPathUtil.GetChapterGuideIconPath(imageName);
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);

BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes