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

GameClient/Assets/Editor/Excel/Scanner/SuitGuideScanner.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using GFGGame;
+
+namespace GFGEditor
+{
+    public class SuitGuideScanner
+    {
+        private static List<int> suitIds = new List<int>();
+
+        public static void StartScan()
+        {
+            suitIds.Clear();
+            var dataArray = SuitGuideMenuCfgArray.Instance.dataArray;
+
+            string strs = "";
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                SuitGuideMenuCfg cfg = dataArray[i];
+                string str = string.Format(";{0}", cfg.suitIds);
+                strs += str;
+            }
+
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                // foreach (var cfg in dataArray)
+                // {
+
+                SuitGuideMenuCfg cfg = dataArray[0];
+                var names = new string[] { nameof(cfg.suitIds) };
+                var values = new string[] { strs };
+                SQLiteHelper.Instance.UpdateValues(nameof(SuitGuideMenuCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
+                // }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+        }
+    }
+}

GameClient/Assets/Editor/Excel/Scanner/SuitGuideScanner.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 89bc618d7ad4a5841b3467a9054e26b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -35,7 +35,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardInfoProto.CardId);
             if (itemCfg == null)
             {
-                ET.Log.Error(cardInfoProto.CardId + "ItemCfgArray配置不存在");
+                ET.Log.Error(cardInfoProto.CardId + "   ItemCfgArray配置不存在");
                 return;
             }
             cardData.id = cardInfoProto.CardId;

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/SuitCfgManager.cs

@@ -57,7 +57,6 @@ namespace GFGGame
             if (suitCfg == null)
             {
                 ET.Log.Error(suitId + "  SuitCfgArrayÅäÖò»´æÔÚ");
-                return new int[] { };
             }
             if (checkScene)
             {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -88,6 +88,8 @@ namespace GFGGame
             _ui.m_t1.Play();
             openCount = 0;
             openIndex = 0;
+            newCardList.Clear();
+            newItemList.Clear();
             Timers.inst.Remove(UpdateTime);
         }
 
@@ -314,8 +316,7 @@ namespace GFGGame
 
             if (newCardList.Count > 0)
             {
-                ViewManager.Show<LuckyBoxNewCardView>(new object[] { newCardList, newItemList }
-                );
+                ViewManager.Show<LuckyBoxNewCardView>(new object[] { newCardList, newItemList });
             }
             else if (newItemList.Count > 0)
             {