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

client_linchunjie

2018-08-24 20edfef17946c2f9175e5d4aef79d3cdff5fdb17

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

 System/FindPrecious/ElderGodAreaRebornWin.cs

@@ -98,7 +98,6 @@
        {
            sendReborn = true;
            DeadModel.SendRebornQuest(0);
            WindowCenter.Instance.Close<ElderGodAreaRebornWin>();
        }
    }


 System/GeneralConfig/GeneralConfig.cs

@@ -127,11 +127,13 @@
    public List<int> dungeonCanUseMoneyIds { get; private set; }



    public Dictionary<int, int> dungeonRebornClientTimes { get; private set; }

    public int[] CompareEquipPlaces { get; private set;}



    public void Init()

    {

        try

        {

            CompareEquipPlaces = GetIntArray("EquipUpType");

            greatMasterStartLV = GetInt("GreatMasterStartLV");

            playerMaxLevel = GetInt("PlayerMaxLV");

            potentialUpSuccessRecommend = GetFloat("SPSkillType", 2) * 0.0001f;


 System/KnapSack/Logic/PackModelInterface.cs

@@ -289,7 +289,7 @@
        private int GetEquipScore(PackType type,int itemId, Dictionary<AttrEnum, int> specAttrDict)

        {

            tagChinModel = Config.Instance.Get<ItemConfig>(itemId);

            if (tagChinModel == null || tagChinModel.EquipPlace == 0) return 0;

            if (tagChinModel == null ||  !GeneralConfig.Instance.CompareEquipPlaces.Contains(tagChinModel.EquipPlace)) return 0;



            Equation.Instance.Clear();

            _tagGsProValueDict = EquipGSParamConfig.GetTagGsProValueDict(tagChinModel.LV, tagChinModel.ItemColor,tagChinModel.StarLevel);


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -381,7 +381,10 @@
                        });

                        break;

                    default:

                        ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("KnapS142", needRealmImgStr.ToString(), curRealmImgStr.ToString()));

                        ConfirmCancel.ShowRealmPopConfirm(Language.Get("Mail101"), Language.Get("KnapS142", needRealmImgStr.ToString(), curRealmImgStr.ToString()), Language.Get("PopConfirmWin_Promote"), () =>

                        {

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RealmFunc1);

                        });

                        break;

                }

                return false;


 System/PlayerDead/PlayerDeadModel.cs

@@ -246,6 +246,7 @@
        WindowCenter.Instance.CloseImmediately<RebornWin>();

        WindowCenter.Instance.CloseImmediately<ReliveWin>();

        WindowCenter.Instance.CloseImmediately<RebornTiredWin>();

        WindowCenter.Instance.CloseImmediately<ElderGodAreaRebornWin>();



        if (CloseRebornWinEvent != null)

        {