Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -109,8 +109,8 @@ namespace GFGEditor
         public static string ModelMd5FileSaveName = "ModelMd5";
 
 
-        public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Texture_DIR_PATH}/Effect/" }; } }
-        public static string TextureTargetPath = $"{ResPathUtil.Texture_DIR_PATH}/Effect/";
+        public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.TEXTURE_DIR_PATH}/Effect/" }; } }
+        public static string TextureTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Effect/";
         public static string EffectTextureMd5FileSaveName = "EffectTextureMd5";
 
 

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -21,7 +21,6 @@ namespace GFGGame
         public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
         public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
         public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
-        public static readonly string Texture_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
 
         public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -67,9 +67,13 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
                     res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
+                    _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
                     // ET.Log.Debug("技能" + skillCfg.skillId + "  未配资源");
                 }
-                _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
+                else
+                {
+                    //to do...
+                }
                 _ui.m_comSkillShow.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_comSkillShow.m_t0.Play(() =>
                 {

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -3,7 +3,6 @@ using ET;
 using FairyGUI;
 using UI.CommonGame;
 using UI.Task;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -181,8 +180,7 @@ namespace GFGGame
 
         private void OnBtnGoClick(EventContext context)
         {
-            if (!(context.sender is GObject btnGo)) return;
-            var taskCfg = btnGo.data as TaskCfg;
+            if (!(context.sender is GObject { data: TaskCfg taskCfg })) return;
             //功能未开放
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
             Hide();