少年修仙传客户端代码仓库
client_Wu Xijin
2019-07-05 5c28a613396a296ff1727088dc4967a8f9a51365
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

# Conflicts:
# Lua/Gen/SnxxzUIEquipFightPowerWrap.cs.meta
7个文件已修改
114 ■■■■■ 已修改文件
System/Alchemy/AlchemyBasicDrugWin.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyModel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyNormalUseDrugWin.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyStoveBehaviour.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyUseDrugCell.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyUseDrugWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/ExchangeActiveTokenModel.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyBasicDrugWin.cs
@@ -15,6 +15,19 @@
    public class AlchemyBasicDrugWin : AlchemyDrugWin
    {
        protected override void OnPreClose()
        {
            base.OnPreClose();
            if (FunctionalGuideCenter.Instance.ExistUnderwayGuide(131))
            {
                FunctionalGuideCenter.Instance.RemoveGuide(131);
            }
            if (FunctionalGuideCenter.Instance.ExistUnderwayGuide(132))
            {
                FunctionalGuideCenter.Instance.RemoveGuide(132);
            }
        }
    }
}
System/Alchemy/AlchemyModel.cs
@@ -59,6 +59,8 @@
        public int normalBatchAlchemyLevel { get; private set; }
        Dictionary<int, int> alchemyRedpointLevelLimits;
        public int autoFunctionGuideLevel { get; private set; }
        public bool isServerPrepare { get; private set; }
        public event Action selectAlchemyRefresh;
@@ -181,6 +183,7 @@
                funcConfig = FuncConfigConfig.Get("AlchemyRedPoint");
                normalBatchAlchemyLevel = int.Parse(funcConfig.Numerical2);
                alchemyRedpointLevelLimits = ConfigParse.GetDic<int, int>(funcConfig.Numerical3);
                autoFunctionGuideLevel = int.Parse(funcConfig.Numerical4);
            }
            {
System/Alchemy/AlchemyNormalUseDrugWin.cs
@@ -14,7 +14,37 @@
    public class AlchemyNormalUseDrugWin : AlchemyUseDrugWin
    {
        protected override void OnAfterOpen()
        {
            base.OnAfterOpen();
            if (PlayerDatas.Instance.baseData.LV < model.autoFunctionGuideLevel
                && !FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide()
                && model.alchemyDrugRedpoint3.state == RedPointState.Simple)
            {
                m_Controller.JumpIndex(0);
                NewBieCenter.Instance.ResetGuide(133);
                StartCoroutine(Co_StartGuied(133));
            }
        }
        protected override void OnPreClose()
        {
            base.OnPreClose();
            if (FunctionalGuideCenter.Instance.ExistUnderwayGuide(133))
            {
                FunctionalGuideCenter.Instance.RemoveGuide(133);
            }
            StopAllCoroutines();
        }
        IEnumerator Co_StartGuied(int guide)
        {
            yield return null;
            FunctionalGuideCenter.Instance.StartGuide(guide);
        }
    }
}
System/Alchemy/AlchemyStoveBehaviour.cs
@@ -144,8 +144,23 @@
                    DisplayAlchemyTime();
                    break;
                case 2:
                    if (model.selectAlchemyType == AlchemyType.Normal && PlayerDatas.Instance.baseData.LV < model.autoFunctionGuideLevel &&
                        !FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide())
                    {
                        NewBieCenter.Instance.ResetGuide(131);
                        StartCoroutine(Co_StartGuied(131));
                    }
                    m_AlchemyCompleteEffect.Play();
                    break;
            }
            if (model.selectAlchemyType == AlchemyType.Normal && PlayerDatas.Instance.baseData.LV < model.autoFunctionGuideLevel
                && !FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide()
                && model.alchemyDrugRedpoint3.state == RedPointState.Simple
                && state != 2)
            {
                NewBieCenter.Instance.ResetGuide(132);
                StartCoroutine(Co_StartGuied(132));
            }
            DisplayViewLength();
@@ -171,6 +186,12 @@
                        break;
                }
            }
        }
        IEnumerator Co_StartGuied(int guide)
        {
            yield return null;
            FunctionalGuideCenter.Instance.StartGuide(guide);
        }
        void DisplayReikiPoint()
@@ -458,6 +479,11 @@
                    break;
                case 2:
                    pak.DoType = 3;
                    if (FunctionalGuideCenter.Instance.ExistUnderwayGuide(131))
                    {
                        FunctionalGuideCenter.Instance.RemoveGuide(131);
                    }
                    break;
            }
            GameNetSystem.Instance.SendInfo(pak);
System/Alchemy/AlchemyUseDrugCell.cs
@@ -21,8 +21,10 @@
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        public void Display(int itemId)
        public void Display(int itemId, int displayIndex)
        {
            this.gameObject.name = "AlchemyUseDrugCell_" + displayIndex;
            var count = packModel.GetItemCountByID(PackType.Item, itemId);
            var itemModel = new ItemCellModel(itemId, true, (ulong)count);
            m_Item.Init(itemModel);
System/Alchemy/AlchemyUseDrugWin.cs
@@ -15,13 +15,13 @@
    public class AlchemyUseDrugWin : Window
    {
        [SerializeField] AlchemyType m_AlchemyType;
        [SerializeField] ScrollerController m_Controller;
        [SerializeField] protected ScrollerController m_Controller;
        //[SerializeField] AlchemySortBehaviour m_AlchemyTypeSort;
        //[SerializeField] AlchemySortBehaviour m_AlchemyQualitySort;
        List<int> displayItems = new List<int>();
        AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
        protected AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        #region Built-in
@@ -134,7 +134,7 @@
        private void OnRefreshCell(ScrollerDataType type, CellView cell)
        {
            var useDrugCell = cell as AlchemyUseDrugCell;
            useDrugCell.Display(displayItems[cell.index]);
            useDrugCell.Display(displayItems[cell.index], cell.index);
        }
        private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)
System/FairyAu/ExchangeActiveTokenModel.cs
@@ -18,9 +18,7 @@
    public int SuitEquipActiveCount { get; private set; }
    public int NormalEquipActiveCount { get; private set; }
    public int Item3801ActiveCount { get; private set; }
    public int Item3802ActiveCount { get; private set; }
    private Dictionary<int, int> m_ItemExcahngeActiveCountDic = new Dictionary<int, int>();
    public event Action RefreshActiveCanGetEvent;
    public event Action ExchangetSuccessEvent;
@@ -159,16 +157,12 @@
        int totalCount = 0;
        foreach (var equip in ChoseEquips)
        {
            if(equip.itemId == 3801)
            if( m_ItemExcahngeActiveCountDic.ContainsKey(equip.itemId) )
            {
                totalCount += Item3801ActiveCount * equip.count;
                totalCount += m_ItemExcahngeActiveCountDic[equip.itemId] * equip.count;
                continue;
            }
            if (equip.itemId == 3802)
            {
                totalCount += Item3802ActiveCount * equip.count;
                continue;
            }
            if (equip.config.SuiteiD == 0)
            {
@@ -191,8 +185,12 @@
        var res2 = FuncConfigConfig.Get("FamilyDonate").Numerical2.Split('|');
        Item3801ActiveCount = int.Parse(res2[0].Split('_')[1]);
        Item3802ActiveCount = int.Parse(res2[1].Split('_')[1]);
        for (int i = 0; i < res2.Length; i++)
        {
            var info = res2[i].Split('_');
            m_ItemExcahngeActiveCountDic[int.Parse(info[0])] = int.Parse(info[1]);
        }
    }
    public void SendExchangeRequest()
@@ -320,9 +318,13 @@
                suitEquips[j] = iEqu;
            }
        }
        //添加物品 ID 3801  3802
        suitEquips.AddRange(m_PackModel.GetItemsById(PackType.Item, 3801));
        suitEquips.AddRange(m_PackModel.GetItemsById(PackType.Item, 3802));
        //添加物品额外物体
        foreach (var itemId in m_ItemExcahngeActiveCountDic.Keys)
        {
            suitEquips.AddRange(m_PackModel.GetItemsById(PackType.Item, itemId));
        }
        return suitEquips;
    }