Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-10-17 ea09ad4b41c0a0611122a850dadbf59307ce7aec

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/BlastFurnace/SortMakeDrugTable.cs

@@ -96,7 +96,8 @@
            var lv = m_SortElements[cell.index].type;

            if (lv !=0)

            {

                _sortCell.sortTypeTxt.text = Language.Get(stringKey,lv);

                string lvStr = Language.Get(StringUtility.Contact("Num_CHS_", lv));

                _sortCell.sortTypeTxt.text = Language.Get(stringKey, lvStr);

            }

            else

            {


 System/Compose/New/ComposeWinModel.cs

@@ -542,22 +542,15 @@


        if(fixedMat.Count > 0 && unfixedMat.Count  > 0)

        {

            if(isFixedBind && isUnFixedBind)

            if(isFixedBind != isUnFixedBind 
                || (isFixedBind == isUnFixedBind && fixedNoBindRecord != unfixedNoBindRecord))

            {

                return false;

                return true;

            }

            else

            {

                if (isFixedBind || isUnFixedBind)

                {

                    return true;

                }

                else

                {

                    return false;

                }

                return false;

            }

           
        }

        else if(fixedMat.Count > 0)

        {


 System/FairyAu/FairyGrabBossModel.cs

@@ -162,6 +162,7 @@
                    {

                        onStateUpate((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);

                    }

                    UpdateNoticeRedpoint();

                }

            }

        }


 System/FairyAu/FairyLeagueModel.cs

@@ -185,7 +185,7 @@
                {

                    OnRefreshFairyLeagueEvent();

                }

                DebugEx.LogFormat("进入{0}阶段", fairyLeagueStage);

                UpdateNoticeRedpoint();

            }

        }