少年修仙传客户端代码仓库
client_linchunjie
2019-01-10 921becc8d732b38c18eca853f609287dae577049
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
49 ■■■■■ 已修改文件
System/Compose/New/ComposeTicketWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeToolsWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWingsWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HappyXB/HappyXBGetItemWin.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeTicketWin.cs
@@ -142,7 +142,7 @@
                {
                    isJumpTo = false;
                    bool isCanCompose = true;
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))
                    {
                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
                        isCanCompose = false;
System/Compose/New/ComposeToolsWin.cs
@@ -169,7 +169,7 @@
                {
                    isJumpTo = false;
                    bool isCanCompose = true;
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))
                    {
                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
                        isCanCompose = false;
System/Compose/New/ComposeWin.cs
@@ -69,9 +69,7 @@
        protected override void OnPreOpen()
        {
            DebugEx.Log("是否跳转打开界面:" + WindowJumpMgr.Instance.IsJumpState);
            ComposeModel.ResetModel();
            if (WindowJumpMgr.Instance.IsJumpState && ComposeModel.secondType == 0)
            {
                if (ComposeModel.CurComposeModel != null)
@@ -111,6 +109,7 @@
        protected override void OnActived()
        {
            base.OnActived();
            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)
            {
                if(ComposeModel.composeToolRed.state == RedPointState.Simple)
@@ -157,7 +156,7 @@
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
@@ -275,7 +274,6 @@
        private void GatherSoulCompose()
        {
            ComposeModel.SetCurComposeModel(null);
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
@@ -301,6 +299,10 @@
        public void OnClickCloseBtn()
        {
            if(ComposeModel.CurComposeModel != null)
            {
                ComposeModel.SetCurComposeModel(null);
            }
            CloseSubWindows();
            CloseImmediately();
        }
System/Compose/New/ComposeWingsWin.cs
@@ -170,7 +170,7 @@
                {
                    isJumpTo = false;
                    bool isCanCompose = true;
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))
                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))
                    {
                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
                        isCanCompose = false;
System/HappyXB/HappyXBGetItemWin.cs
@@ -347,23 +347,30 @@
                isMoneyEnough = UIHelper.GetMoneyCnt(1) >= (ulong)manyMoney;
            }
            if (isMoneyEnough)
            switch(costType)
            {
                switch (XBModel.title)
                {
                    case HappXBTitle.Best:
                        XBModel.SendXBQuest(1, xbNum, costType);
                        break;
                    case HappXBTitle.Rune:
                        XBModel.SendXBQuest(2, xbNum, costType);
                        break;
                }
                case 0:
                    if (!isMoneyEnough)
                    {
                        WindowCenter.Instance.Open<RechargeTipWin>();
                        return;
                    }
                    break;
                case 1:
                case 2:
                    break;
            }
            else
            switch (XBModel.title)
            {
                WindowCenter.Instance.Open<RechargeTipWin>();
                case HappXBTitle.Best:
                    XBModel.SendXBQuest(1, xbNum, costType);
                    break;
                case HappXBTitle.Rune:
                    XBModel.SendXBQuest(2, xbNum, costType);
                    break;
            }
        }
        private void OnStartXB(int oneOrMany)