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

client_linchunjie

2019-01-23 173c34259cdc5511420c49bf503e3be674f3ca99

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

 Core/GameEngine/Login/Launch.cs

@@ -807,14 +807,17 @@
    public class ConfigInitTask : LaunchTask

    {

        public override float expectTime {

            get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", 10f); }

            get { return LocalSave.GetFloat("ConfigInitTask_ExpectTime", inferredTime); }

            protected set { LocalSave.SetFloat("ConfigInitTask_ExpectTime", value); }

        }



        float threshold = 1f;

        float inferredTime = 3f;



        public override void Begin()

        {

            inferredTime = LocalSave.GetFloat("AssetCopyTask_ExpectTime", 30f) / 30f * 10f;



            m_CurrentStage = LaunchStage.ConfigInit;

            duration = Mathf.Max(0.1f, expectTime);

            threshold = Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.9f;


 System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs

@@ -37,7 +37,7 @@
            decomposeModel.UpdateSelectItemEvent += UpdateSelectItem;

            sortTable.onSortCloseEvent += CloseSortTable;

            sortTable.onSelectSortEvent += UpdateSelectEquipLv;

            sortTable.SetDefault();

            sortTable.SetDefault(decomposeModel.selectEquipLv);

            SetDisplay();

        }




 System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs

@@ -89,7 +89,7 @@
            }

            else

            {

                titleText.text = Language.Get("进阶属性");

                titleText.text = Language.Get("JadeDynastyEquip4");

            }



            List<int> suitTypes = equipModel.suitTypeDict.Keys.ToList();

@@ -199,7 +199,7 @@
                        }

                        else

                        {

                            equipsName = StringUtility.Contact(" ", equipName);

                            equipsName = StringUtility.Contact(equipsName, " ", equipName);

                        }

                    }

                    string conditionSB = Language.Get("JadeDynastyEquip1",equipsName,suitAttrData.suitLv);


 System/KnapSack/Logic/PackModelInterface.cs

@@ -1673,10 +1673,6 @@
                        }

                    }

                }

                else

                {

                    putOnModel = putOnModel2;

                }



                int equipScore1 = 0;

                if (putOnModel != null)


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -433,10 +433,7 @@
    }

    private void SetRedPointId()//设置红点ID

    {

        if (RedPointDic.Count > 0)

        {

            return;

        }

        RedPointDic.Clear();

        foreach (var key in WeekPartyDayInfoDic.Keys)

        {

            int RedPoint = Redpoint_key1 * 10 + key;


 UI/Common/SortTable.cs

@@ -80,12 +80,31 @@
            _sortCell.sortTypeTxt.text = Language.Get(m_SortElements[cell.index].textKey);

        }



        public void SetDefault()

        public void SetDefault(int value = 0)

        {

            if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)

            if(value == 0)

            {

                m_TargetDisplay.text = Language.Get(m_SortElements[0].textKey);

                if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)

                {

                    m_TargetDisplay.text = Language.Get(m_SortElements[0].textKey);

                }

            }

            else

            {

                if (m_TargetDisplay != null && m_SortElements != null && m_SortElements.Count > 0)

                {

                    foreach(var key in m_SortElements)

                    {

                        if(key.type == value)

                        {

                            m_TargetDisplay.text = Language.Get(key.textKey);

                            break;

                        }

                    }

                  
                }

            }

           
        }

    }