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

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -17,11 +17,6 @@ namespace GFGEditor
         public static string excelsCacheFolderPath = excelsFolderPath + "/CacheConfig/";
 
         /// <summary>
-        /// 共享库中存放sqlite文件的的路径
-        /// </summary>
-        public const string sqliteFilePathCSShare = "Assets/Game/CSShare/Sqlite/excelConfig.sqlite";
-
-        /// <summary>
         /// 存放编辑器序列化文件的文件夹路径
         /// </summary>
         public const string configCodePath = "Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/GenCode/Item/";

GameClient/Assets/Editor/ToolsMenu.cs

@@ -14,6 +14,8 @@ namespace GFGEditor
     {
         public static bool CommitWhenRelease = true;
 
+        public static string[] resArr = new string[] { "Res", "ResIn", "Game/CSShare/Sqlite" };
+
         enum TOOL_MENU_PRIORITY
         {
             UpdateAndImportAll,
@@ -79,7 +81,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting");
             EditorUtility.ClearProgressBar();
             if (CommitWhenRelease)
             {
@@ -207,8 +209,6 @@ namespace GFGEditor
             //}
             //开始扫描表格，自动生成部分数据
             ExcelScanner.StartScan();
-            //拷贝slqlite文件至共享库
-            File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
             SQLiteHelper.Instance.CloseConnection();
@@ -323,7 +323,7 @@ namespace GFGEditor
         public static void BuildBundlesRes()
         {
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting");
         }
 
         //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
@@ -371,7 +371,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在发布临时版本", 1);
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting1");
             EditorUtility.ClearProgressBar();
         }
 

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

@@ -8,7 +8,7 @@ namespace GFGGame
         public static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
         public static readonly string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
         public static readonly string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
-        public static readonly string CONFIG_DIR_PATH = "Assets/ResIn/Config";
+        public static readonly string CONFIG_DIR_PATH = "Assets/Game/CSShare/Sqlite";
 
 
         public const string RES_ROOT_DIR_PATH = "Assets/Res";

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -11,8 +11,8 @@ namespace GFGGame
     {
         private UI_StudioBuyNumUI _ui;
         private int _limitId;
-        private RoleLimitData _studioData;
-        private LimitCfg _studioCfg;
+        private RoleLimitData _limitData;
+        private LimitCfg _limitCfg;
 
         private int _index;
 
@@ -50,25 +50,25 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _limitId = (int)this.viewData;
+            _limitData = RoleLimitDataManager.GetLimitData(_limitId);
+            _limitCfg = LimitCfgArray.Instance.GetCfg(_limitId);
+
             UpdateView();
         }
 
 
         private void UpdateView()
         {
-            _limitId = (int)this.viewData;
-            _studioData = RoleLimitDataManager.GetLimitData(_limitId);
-            _studioCfg = LimitCfgArray.Instance.GetCfg(_limitId);
-
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _studioData.BuyTimes, _studioCfg.buyNum);
+            _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
 
-            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _studioCfg.itemID, _studioCfg.itemNum, true);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _limitCfg.itemID, _limitCfg.itemNum, true);
 
-            if (_studioCfg.moneyId <= 0) return;
+            if (_limitCfg.moneyId <= 0) return;
             _ui.m_c1.selectedIndex = 1;
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
-            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _studioCfg.moneyId, moneyNum, true);
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _limitCfg.moneyId, moneyNum, true);
 
         }
 
@@ -83,14 +83,14 @@ namespace GFGGame
         }
         private void OnClickBtnBuy(int type)
         {
-            if (_studioData.BuyTimes == _studioCfg.buyNum)
+            if (_limitData.BuyTimes == _limitCfg.buyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日购买次数已达上限", MessageType.ERR);
                 return;
             }
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
 
-            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_studioCfg.itemID) < _studioCfg.itemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
+            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_limitCfg.itemID) < _limitCfg.itemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足", MessageType.ERR);
                 return;
@@ -106,7 +106,7 @@ namespace GFGGame
             }
             PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
             UpdateView();
-            if (_studioData.BuyTimes == _studioCfg.buyNum)
+            if (_limitData.BuyTimes == _limitCfg.buyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日购买次数已达上限", MessageType.ERR);
                 this.Hide();

GameClient/Assets/ResIn/Config.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f3e788236d9da284e8fa725fc87ababd
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b666127406be94f43992f57c49d5497b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: