Browse Source

卡牌预制

zhaoyang 3 years ago
parent
commit
16e46f90d1

+ 3 - 3
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -122,9 +122,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入背景图", 1);
             ImportRes(BgSrcPaths, BgTargetPath, BgMd5FileSaveName);
 
-            //卡牌背景
-            EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
-            ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
+            // //卡牌背景
+            // EditorUtility.DisplayProgressBar("进度", "正在导入卡牌背景", 1);
+            // ImportRes(CardBgSrcPaths, CardBgTargetPath, CardBgMd5FileSaveName);
             //卡牌icon
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(CardIconSrcPaths, CardIconTargetPath, CardMd5FileSaveName);

+ 1 - 1
GameClient/Assets/Editor/FileUtil.cs

@@ -365,7 +365,7 @@ namespace GFGEditor
                 foreach (var lDir in localDirs)
                 {
                     string lDirName = Path.GetFileName(lDir);
-
+                    if (lDirName == "Card") continue;
                     bool needDelete = false;
                     foreach (var sDir in souDirs)
                     {

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -163,12 +163,12 @@ namespace GFGGame
                 _cardObj = null;
             }
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
-            if (Versions.Contains(resPath))
-            {
-                _cardObj = DressUpUtil.AddAnimationObj(resPath);
-                SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
+            // if (Versions.Contains(resPath))
+            // {
+            _cardObj = DressUpUtil.AddAnimationObj(resPath);
+            SceneController.AddObjectToView(_cardObj, _wrapper, _ui.m_comCard.m_comCardHolder.m_holder, resPath, out _cardObj, out _wrapper);
 
-            }
+            // }
 
             if (_cardObj != null)
             {

+ 1 - 1
GameClient/Assets/Scenes/GameLauncher.unity

@@ -277,7 +277,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170410349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.8125, y: -5, z: 0}
+  m_LocalPosition: {x: 2.25, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}