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

client_Wu Xijin

2018-08-24 77ffb6b3fddc47a8fdc20d3c36c02e5a850a0ea5

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

 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/Realm/RealmUpWin.cs

@@ -103,7 +103,7 @@
        protected override void OnAfterOpen()

        {

            HandleAchievement();

            if (realmModel.openByDungeonStep)

            if (realmModel.openByDungeonStep && !realmModel.realmDungeonState)

            {

                m_RawBoss.gameObject.SetActive(false);

                m_RawPlayer.gameObject.SetActive(false);


 System/Treasure/TreasureAnimation.cs

@@ -97,6 +97,7 @@
                {

                    if (value == TreasureShowStep.UnLock)

                    {

                        m_ProgressPosTween.SetEndState();

                        UI3DTreasureSelectStage.Instance.SetEndState();

                    }

                    return;