zhaoyang 3 жил өмнө
parent
commit
2d52c20d3d

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

@@ -74,6 +74,11 @@ namespace GFGEditor
         public static string ActivityShow1TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show1/";
         public static string ActivityShow1TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show1/";
         public static string ActivityShow1Md5FileSaveName = "ActivityShow1Md5";
         public static string ActivityShow1Md5FileSaveName = "ActivityShow1Md5";
 
 
+        private static string[] PhotoGraphBorderPaths { get { return new string[] { ResRootPath + "边框/" }; } }
+        public static string PhotoGraphBorderTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Photograph/border/";
+        public static string PhotoGraphBorderMd5FileSaveName = "PhotoGraphBorderMd5";
+
+
 
 
         private static string[] ActivityShow2SrcPaths { get { return new string[] { ResRootPath + "activity/show2/" }; } }
         private static string[] ActivityShow2SrcPaths { get { return new string[] { ResRootPath + "activity/show2/" }; } }
         public static string ActivityShow2TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show2/";
         public static string ActivityShow2TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show2/";
@@ -132,7 +137,9 @@ namespace GFGEditor
             //活动展示图2
             //活动展示图2
             EditorUtility.DisplayProgressBar("进度", "正在导入活动展示图2", 1);
             EditorUtility.DisplayProgressBar("进度", "正在导入活动展示图2", 1);
             ImportRes(ActivityShow2SrcPaths, ActivityShow2TargetPath, ActivityShow2Md5FileSaveName);
             ImportRes(ActivityShow2SrcPaths, ActivityShow2TargetPath, ActivityShow2Md5FileSaveName);
-
+            //拍照边框
+            EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
+            ImportRes(PhotoGraphBorderPaths, PhotoGraphBorderTargetPath, PhotoGraphBorderMd5FileSaveName);
             //清除冗余动画
             //清除冗余动画
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);

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

@@ -26,7 +26,7 @@ namespace GFGGame
                 GameObject.Destroy(spr);
                 GameObject.Destroy(spr);
             }
             }
             if (itemCfg.id == PhotographDataManager.BORDERID) return;
             if (itemCfg.id == PhotographDataManager.BORDERID) return;
-            string resPath = ResPathUtil.GetPhotographFPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            string resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
             SceneController.SetSpriteRendererToTransform(tf, resPath);
             SceneController.SetSpriteRendererToTransform(tf, resPath);
             spr = tf.GetComponent<SpriteRenderer>();
             spr = tf.GetComponent<SpriteRenderer>();
             spr.sortingOrder = 10000;//边框在所有道具的上边
             spr.sortingOrder = 10000;//边框在所有道具的上边

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -47,9 +47,9 @@ namespace GFGGame
         {
         {
             return $"{TEXTURE_DIR_PATH}/Npc/PicF/{res}.{extName}";
             return $"{TEXTURE_DIR_PATH}/Npc/PicF/{res}.{extName}";
         }
         }
-        public static string GetPhotographFPath(string res, string extName = "png")
+        public static string GetPhotographBorderPath(string res, string extName = "png")
         {
         {
-            return $"{TEXTURE_DIR_PATH}/Photograph/{res}.{extName}";
+            return $"{TEXTURE_DIR_PATH}/Photograph/border/{res}.{extName}";
         }
         }
         public static string GetFieldGuideIconPath(string res, string extName = "png")
         public static string GetFieldGuideIconPath(string res, string extName = "png")
         {
         {

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes