少年修仙传客户端代码仓库
client_Hale
2019-01-05 7b20cad8b8377ff63450058101de0460ced5a0e3
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
49 ■■■■ 已修改文件
System/Compose/New/ComposeWingsWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/FairyLeagueRemindBehaviour.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatherSoulHoleBehaviour.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatheringSoulModel.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWingsWin.cs
@@ -40,6 +40,8 @@
        [SerializeField]
        Button onekeyPutBtn;
        [SerializeField] GameObject composeItemSelectObj;
        [SerializeField] UIEffect oneMatEffect;
        [SerializeField] UIEffect twoMatEffect;
        [SerializeField] UIEffect threeMatEffect;
@@ -470,6 +472,8 @@
            successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(compoundModel.successRate / 100, "%"));
            composeWinModel.SetCurComposeModel(compoundModel);
            UpdateComposeMat();
            composeItemSelectObj.SetActive(compoundModel.secondType < 4);
        }
        private bool ChangeFixedMatUI()
System/FairyAu/FairyLeagueRemindBehaviour.cs
@@ -34,8 +34,9 @@
            model.onFairyLeagueBattleEvent += OnFairyLeagueBattleEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
            requireRemind = SatisfyRemindCondition() && model.RequireFairyLeagueRemind(1)
                && TryGetStartTime(out startTime);
                && TryGetStartTime(out startTime) && !InCrossServer();
            m_Container.gameObject.SetActive(requireRemind);
            if (requireRemind)
            {
@@ -50,6 +51,7 @@
            model.onFairyLeagueBattleEvent -= OnFairyLeagueBattleEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
            requireRemind = false;
        }
@@ -111,10 +113,18 @@
            }
        }
        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)
        {
            if (refreshType == PlayerDataRefresh.ExAttr5)
            {
                OnRefreshFairyLeagueEvent();
            }
        }
        private void OnFairyLeagueBattleEvent()
        {
            requireRemind = SatisfyRemindCondition() && model.RequireFairyLeagueRemind(1)
                && TryGetStartTime(out startTime);
                && TryGetStartTime(out startTime) && !InCrossServer();
            m_Container.gameObject.SetActive(requireRemind);
            if (requireRemind)
            {
@@ -125,7 +135,7 @@
        private void OnRefreshFairyLeagueEvent()
        {
            requireRemind = SatisfyRemindCondition() && model.RequireFairyLeagueRemind(1)
                && TryGetStartTime(out startTime);
                && TryGetStartTime(out startTime) && !InCrossServer();
            m_Container.gameObject.SetActive(requireRemind);
            if (requireRemind)
            {
@@ -140,6 +150,11 @@
            return fairyLeagueStage == FairyLeagueStage.Grouping && session == 1;
        }
        bool InCrossServer()
        {
            return PlayerDatas.Instance.baseData.ExAttr5 == 1;
        }
        bool TryGetStartTime(out DateTime time)
        {
            time = DateTime.Now;
System/GatheringSoul/GatherSoulHoleBehaviour.cs
@@ -111,6 +111,13 @@
                    {
                        data.SetTipsFuncBtn(ItemWinBtnType.LevelUp, OnTipFunc);
                    }
                    List<GatherSoulItem> list = new List<GatherSoulItem>();
                    model.TryGetSatisfyReplaceSouls(hole, ref list);
                    if (list.Count > 0)
                    {
                        data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);
                        list = null;
                    }
                    itemTipsModel.SetItemTipsModel(data);
                }
                else
System/GatheringSoul/GatheringSoulModel.cs
@@ -774,7 +774,20 @@
                    }
                    else
                    {
                        ExecuteResolve(item);
                        if (item.itemColor >= RARA_GATHERSOUL_QUALITY)
                        {
                            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("RareGatherSoulResolveConfirm"), (bool isOk) =>
                            {
                                if (isOk)
                                {
                                    ExecuteResolve(item);
                                }
                            });
                        }
                        else
                        {
                            ExecuteResolve(item);
                        }
                    }
                    break;
                case ItemWinBtnType.Wear:
@@ -1456,7 +1469,7 @@
                        list.Add(item);
                        continue;
                    }
                    if (item.itemType == GATHERSOUL_SOUL_TYPE ||
                    if (item.itemType == GATHERSOUL_CORE_TYPE ||
                        item.itemColor >= RARA_GATHERSOUL_QUALITY)
                    {
                        continue;