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

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -81,6 +81,7 @@ namespace GFGGame
             _ui = UI_ClothingSyntheticUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            layer = ConstViewLayer.TOP;
             //isReturnView = true;
             //this.clickBlankToClose = false;
 
@@ -436,7 +437,8 @@ namespace GFGGame
             UI_MateriasListItem.ProxyEnd();
 
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 6);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -244,7 +244,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 3, "查看已解锁的图谱。", suitIndex);
+            //GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 3, "查看已解锁的图谱。", suitIndex);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpConfigUtil.cs

@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+using static GFGGame.ConfigUtil;
+
+namespace GFGGame
+{
+    public class DressUpConfigUtil
+    {
+        private static int loadCount;
+
+        public static int LoadCount { get => loadCount; set => loadCount = value; }
+
+        //多列值查询多个数据
+        public static async Task GetCfgsAsync<T>(string tableName, string[] colNames, string[] colValues, Dictionary<string, List<T>> cfgsDic, HandleCfgInGroupAction<T> action = null) where T : ICfg, new()
+        {
+            string key = string.Join("_", colValues);
+            List<T> cfgs = null;
+            if (cfgsDic != null && cfgsDic.ContainsKey(key))
+            {
+                cfgs = cfgsDic[key];
+                return;
+            }
+            cfgs = new List<T>();
+            SQLiteHelper.Instance.OpenConnection();
+            int count = 0;
+            try
+            {
+                var reader = SQLiteHelper.Instance.ReadTable(tableName, colNames, colValues);
+                while (reader.Read())
+                {
+                    var cfg = new T();
+                    cfg.setData(reader);
+                    cfgs.Add(cfg);
+                    action?.Invoke(cfg);
+                    ItemCfg itemCfg = cfg as ItemCfg;
+                    if (itemCfg.isHide != 0)
+                    {
+                        continue;
+                    }
+                    ++count;
+                    ++LoadCount;
+                    if (count == 5)
+                    {
+                        count = 0;
+                        await Task.Delay(1);
+                    }
+                }
+                if (cfgsDic != null)
+                {
+                    cfgsDic.Add(key, cfgs);
+                }
+            }
+            catch (System.Exception e)
+            {
+                ET.Log.Error(e);
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+
+
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpConfigUtil.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -86,8 +86,11 @@ namespace GFGGame
 
             if (DressUpMenuItemDataManager.isLoading)
             {
-                ViewManager.Show<ModalStatusView>("加载中...");
+                //ViewManager.Show<ModalStatusView>("加载中...");
+                ViewManager.Show<LoadingView>();
+                DressUpConfigUtil.LoadCount = 0;
                 DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubTypeAsync();
+                Timers.inst.StartCoroutine(UpdateLoadProgress());
             }
             else
             {
@@ -134,6 +137,17 @@ namespace GFGGame
             UI_Button21.ProxyEnd();
         }
 
+        private IEnumerator UpdateLoadProgress()
+        {
+            LoadingView.Instance.SetDesc("正在加载服装数据...");
+            while (DressUpMenuItemDataManager.isLoading)
+            {
+                int sum = GlobalCfgArray.globalCfg.ClothingPartsCount;
+                LoadingView.Instance.SetProgress(FieldGuideView.ProgressCalculate(DressUpConfigUtil.LoadCount, sum));
+                yield return new WaitForEndOfFrame();
+            }
+        }
+
         private void RenderListDressUpItem(int index, GObject item)
         {
             UI_ListDressUpPartsItem listItem = UI_ListDressUpPartsItem.Proxy(item);
@@ -345,7 +359,8 @@ namespace GFGGame
         {
             UpdateItemIdListByType1(0);
             UpdateItemListUI();
-            ViewManager.Hide<ModalStatusView>();
+            //ViewManager.Hide<ModalStatusView>();
+            ViewManager.Hide<LoadingView>();
         }
     }
 }