From 2c6123a7605913bdbf3984b77fbe04446eb400c8 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 27 六月 2019 11:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Skill/QuickSetting.cs |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/System/Skill/QuickSetting.cs b/System/Skill/QuickSetting.cs
index 9cc0610..f14fc94 100644
--- a/System/Skill/QuickSetting.cs
+++ b/System/Skill/QuickSetting.cs
@@ -9,16 +9,14 @@
 /// </summary>
 [XLua.LuaCallCSharp]
 public class QuickSetting : Singleton<QuickSetting>
-
 {
     public QuickSetting()
     {
-        quickSettingDic.Add(QuickSettingType.Skill, new QuickSettingRange(QuickSettingType.Skill, 30, 3));
-        quickSettingDic.Add(QuickSettingType.FairyLeagueGuide, new QuickSettingRange(QuickSettingType.FairyLeagueGuide, 1));
-        quickSettingDic.Add(QuickSettingType.AutoUseXp, new QuickSettingRange(QuickSettingType.AutoUseXp, 1));
-        quickSettingDic.Add(QuickSettingType.SpAnim, new QuickSettingRange(QuickSettingType.SpAnim, 10));
-        quickSettingDic.Add(QuickSettingType.TreasureHighestAnim, new QuickSettingRange(QuickSettingType.TreasureHighestAnim, 10));
-        quickSettingDic.Add(QuickSettingType.GatherSoulAutoResolve, new QuickSettingRange(QuickSettingType.GatherSoulAutoResolve, 1));
+        quickSettingDic.Add(QuickSettingType.Skill, new QuickSettingRange(QuickSettingType.Skill, 0, 30, 3));
+        quickSettingDic.Add(QuickSettingType.SkillMatchPage, new QuickSettingRange(QuickSettingType.SkillMatchPage, 30, 1));
+        quickSettingDic.Add(QuickSettingType.AutoUseXp, new QuickSettingRange(QuickSettingType.AutoUseXp, 31, 1));
+        quickSettingDic.Add(QuickSettingType.SkillMatch, new QuickSettingRange(QuickSettingType.SkillMatch, 32, 45, 1));
+        quickSettingDic.Add(QuickSettingType.GatherSoulAutoResolve, new QuickSettingRange(QuickSettingType.GatherSoulAutoResolve, 80, 1));
         setting = new string(UCharacter, 100);
         DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInitializeEvent;
     }
@@ -26,7 +24,10 @@
     public Dictionary<QuickSettingType, QuickSettingRange> quickSettingDic = new Dictionary<QuickSettingType, QuickSettingRange>();
     public const char UCharacter = '*';
     private string setting;
+    private string cacheSetting;
     private StringBuilder textBuilder = new StringBuilder();
+
+    public event Action onQuickSettingUpdate;
 
     public void SetQuickSetting<T>(QuickSettingType type, T value, int index = 0) where T : struct
     {
@@ -36,10 +37,16 @@
     {
         SetQuickSetting<int>(type, value ? 1 : 0, index);
     }
+
+    public void SetQuickSetting(int type, string value, int index)
+    {
+        SetQuickSetting((QuickSettingType)type, value, index);
+    }
+
     public void SetQuickSetting(QuickSettingType type, string value, int index)
     {
         var quickRange = quickSettingDic[type];
-        if (index * quickRange.single + value.Length > quickRange.length || value.Length > quickRange.single)
+        if ((index - quickRange.index) * quickRange.single + value.Length > quickRange.length || value.Length > quickRange.single)
         {
             DebugEx.LogErrorFormat("瀛樺偍鐨勬暟鎹秴杩囨渶澶ч暱搴�!{0}", type);
             return;
@@ -68,9 +75,15 @@
         if (value != null && value.Length > 0)
         {
             setting = StringUtility.Contact(value, setting.Substring(value.Length, setting.Length - value.Length));
+            cacheSetting = setting;
             PlayerDatas.Instance.baseData.Setting = setting;
         }
         PlayerDatas.Instance.skill.SetQuickSkills();
+
+        if (onQuickSettingUpdate != null)
+        {
+            onQuickSettingUpdate();
+        }
     }
 
     public T GetQuickSettingValue<T>(QuickSettingType type, int index) where T : struct
@@ -102,11 +115,20 @@
         return _value == 1;
     }
 
+    public string GetQuickSetting(int type, int index)
+    {
+        return GetQuickSetting((QuickSettingType)type, index);
+    }
+
     public void SendPackage()
     {
-        C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
-        vNetData.Setting = setting;
-        GameNetSystem.Instance.SendInfo(vNetData);
+        if (cacheSetting != setting)
+        {
+            cacheSetting = setting;
+            C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
+            vNetData.Setting = setting;
+            GameNetSystem.Instance.SendInfo(vNetData);
+        }
     }
 
     private void BeforePlayerDataInitializeEvent()
@@ -119,28 +141,24 @@
     public enum QuickSettingType
     {
         Skill,
-        FairyLeagueGuide,
+        SkillMatchPage,
         AutoUseXp,
-        SpAnim,
-        TreasureHighestAnim,
+        SkillMatch,
         GatherSoulAutoResolve
     }
     public struct QuickSettingRange
     {
-        private static int presentIndex = 0;
-
         public QuickSettingType type;
         public int index;
         public int length;
         public int single;
 
-        public QuickSettingRange(QuickSettingType type, int length, int single = 0)
+        public QuickSettingRange(QuickSettingType type, int start, int length, int single = 0)
         {
             this.type = type;
-            this.index = presentIndex;
+            this.index = start;
             this.length = length;
             this.single = single == 0 ? length : single;
-            presentIndex += length;
         }
     }
 }

--
Gitblit v1.8.0