少年修仙传客户端代码仓库
client_linchunjie
2018-09-19 9cb530106f4ee32d88fc06636af69c0793d4a2a3
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
68 ■■■■ 已修改文件
System/Compose/New/ComposeEquipWin.cs 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeEquipWin.cs
@@ -114,14 +114,38 @@
            UIEventTrigger.Get(helpBtn.gameObject).OnUp = OnDownUp;
            successRate = 0;
            firstTypeDict = composeWinModel.GetFirstTypeModel((int)ComposeFuncType.Equip);
            CreateCell();
            if(curSecondType == 0)
            bool isJumpTo = false;
            if (composeWinModel.secondType != 0)
            {
                RefreshUI(null);
                isJumpTo = true;
                curSecondType = composeWinModel.secondType;
                curThirdType = composeWinModel.thirdType;
                secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Equip, composeWinModel.secondType);
                OnClickSecondType(curSecondType,curThirdType);
                composeWinModel.ResetJumpToModel();
            }
            CreateCell();
            if (compoundModel != null)
            {
                RefreshUI(compoundModel);
                if (isJumpTo)
                {
                    isJumpTo = false;
                    if (!composeWinModel.IsEnoughFixedMat(compoundModel) || !composeWinModel.IsEnoughUnfixedMat(compoundModel))
                    {
                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
                    }
                    else if (!composeWinModel.IsEnoughMoney(compoundModel))
                    {
                        MessageWin.Inst.ShowFixedTip(Language.Get("Z1011"));
                    }
                }
            }
            else
            {
                RefreshUI(null);
            }
        }
@@ -182,7 +206,7 @@
            if (secondTypeDict != null)
            {
                if (secondTypeDict.Count >= 1 && curSecondType != 0
                    && curThirdType == 1)
                    && curThirdType >= 1)
                {
                    int remain = curSecondType - firstTypeDict.Count;
                    if(remain > 0)
@@ -254,30 +278,35 @@
            }
        }
        private void OnClickSecondType(int secondType)
        private void OnClickSecondType(int secondType,int _thirdType = 0)
        {
            curSecondType = secondType;
            secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Equip, curSecondType);
            foreach (var thirdType in secondTypeDict.Keys)
            if(_thirdType == 0)
            {
                if (thirdType != 0)
                foreach (var thirdType in secondTypeDict.Keys)
                {
                    if (preSecondType == curSecondType)
                    if (thirdType != 0)
                    {
                        curSecondType = 0;
                        preSecondType = 0;
                        if (preSecondType == curSecondType)
                        {
                            curSecondType = 0;
                            preSecondType = 0;
                        }
                        curThirdType = thirdType;
                    }
                    curThirdType = thirdType;
                    else
                    {
                        curThirdType = 0;
                    }
                    break;
                }
                else
                {
                    curThirdType = 0;
                }
                break;
            }
            else
            {
                curThirdType = _thirdType;
            }
            if (preSecondType != curSecondType)
            {
                preSecondType = curSecondType;
System/Compose/New/ComposeWin.cs
@@ -152,6 +152,7 @@
        protected override void OnPreClose()
        {
            ComposeModel.ResetJumpToModel();
            selectModel.ClearSelectModel();
        }