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

client_Wu Xijin

2019-01-09 67aeed0c33fed119c47bd965ad45ef9c7ab8b6e9

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

 System/Dungeon/DungeonRealmVictoryWin.cs

@@ -69,7 +69,7 @@
            if (nextCfg != null)

            {

                m_RealmProperties[1].gameObject.SetActive(true);

                m_RealmProperties[1].Display(_realmLv + 1);

                m_RealmProperties[1].Display(_realmLv + 1, false);

                m_NextRealmIcon.gameObject.SetActive(true);

                m_NextRealmIcon.SetSprite(nextCfg.Img);

                m_NextRealmIcon.SetNativeSize();


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -2866,10 +2866,10 @@
                var serverSurplusTimes = GetUseDataModel((int)ItemUseDataKey.Def_IudetTotalTime);

                if(remainTime > 0)

                {

                    if (getTimes != null && serverSurplusTimes != null)

                    if (getTimes != null)

                    {

                        int getTime = getTimes[0];

                        int serverSurplusTime = serverSurplusTimes[0];

                        int serverSurplusTime = serverSurplusTimes != null ? serverSurplusTimes[0] : 0;

                        if (getTime > 0)

                        {

                            double time = modelInterface.GetTimeOffest(TimeUtility.GetTime((uint)getTime));


 System/Rune/RuneModel.cs

@@ -181,7 +181,8 @@
            {

                PlayerPropertyConfig playerPro = Config.Instance.Get<PlayerPropertyConfig>(runeTypes[i]);

                string _str = StringUtility.Contact(playerPro.Name, "+",

                    UIHelper.ReplacePercentage(GetRuneAttrVal(id, level, runeTypes[i]), playerPro.ISPercentage),

                    UIHelper.ReplacePercentage(GetRuneAttrVal(id, level, runeTypes[i]), playerPro.ISPercentage,

                    UIHelper.GetPropertyDecimalCount(playerPro.ID)),

                    playerPro.ISPercentage == 1 ? "%" : string.Empty, i == runeTypes.Length - 1 ? string.Empty : "\n");

                _textBuilder.Append(_str);

            }


 System/Rune/RuneMosaicWin.cs

@@ -181,7 +181,7 @@
            if (AchievementGoto.achievementType == AchievementGoto.RuneLevelUp)

            {

                int _hole = 0;

                if(model.CanLevelUpRune(out _hole))

                if (model.CanLevelUpRune(out _hole))

                {

                    OnRuneHoleClick(_hole);

                    var _effect = AchievementGuideEffectPool.Require(1);

@@ -354,11 +354,12 @@
            presentRuneImg.SetSprite(_itemCfg.IconKey);

            presentRuneAttrTxt.text = model.GetRuneAttrStr(data.id, data.lv);

            presentRuneNameTxt.text = StringUtility.Contact(_itemCfg.ItemName, Language.Get("Z1024", data.lv));

            presentRuneNameTxt.color = UIHelper.GetUIColor(_itemCfg.ItemColor);

            presentRuneNameTxt.color = UIHelper.GetUIColor(_itemCfg.ItemColor, true);



            var _propertyCfg = Config.Instance.Get<PlayerPropertyConfig>(_runeCfg.AttrType[0]);

            var _propertyValue = model.GetRuneAttrVal(data.id, data.lv, _runeCfg.AttrType[0]);

            runeLevelUpAttr1.text = StringUtility.Contact(_propertyCfg.Name, "  ", "+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage),

            runeLevelUpAttr1.text = StringUtility.Contact(_propertyCfg.Name, "+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage,

                UIHelper.GetPropertyDecimalCount(_propertyCfg.ID)),

                _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);



            bool _isRuneMaxLv = data.lv >= model.GetRuneMaxLevelByItem(data.id);

@@ -366,7 +367,8 @@
            if (!_isRuneMaxLv)

            {

                _propertyValue = model.GetRuneAttrVal(data.id, data.lv + 1, _runeCfg.AttrType[0]);

                runeLevelUpAttrNum1.text = StringUtility.Contact("+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage),

                runeLevelUpAttrNum1.text = StringUtility.Contact("+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage,

                    UIHelper.GetPropertyDecimalCount(_propertyCfg.ID)),

                            _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);

            }



@@ -374,13 +376,15 @@
            {

                _propertyCfg = Config.Instance.Get<PlayerPropertyConfig>(_runeCfg.AttrType[1]);

                _propertyValue = model.GetRuneAttrVal(data.id, data.lv, _runeCfg.AttrType[1]);

                runeLevelUpAttr2.text = StringUtility.Contact(_propertyCfg.Name, "  ", "+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage),

                runeLevelUpAttr2.text = StringUtility.Contact(_propertyCfg.Name, "+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage,

                    UIHelper.GetPropertyDecimalCount(_propertyCfg.ID)),

                             _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);

                runeLevelUpAttrNum2.gameObject.SetActive(!_isRuneMaxLv);

                if (!_isRuneMaxLv)

                {

                    _propertyValue = model.GetRuneAttrVal(data.id, data.lv + 1, _runeCfg.AttrType[1]);

                    runeLevelUpAttrNum2.text = StringUtility.Contact("+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage),

                    runeLevelUpAttrNum2.text = StringUtility.Contact("+", UIHelper.ReplacePercentage(_propertyValue, _propertyCfg.ISPercentage,

                        UIHelper.GetPropertyDecimalCount(_propertyCfg.ID)),

                                _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);

                }

            }

@@ -416,7 +420,7 @@
                }

                if (_tower == 0)

                {

                    m_RuneUnlockTip.text = Language.Get("L1060",model.doublePropRuneInlayDict.Values.Last());

                    m_RuneUnlockTip.text = Language.Get("L1060", model.doublePropRuneInlayDict.Values.Last());

                }

                else

                {


 Utility/UIHelper.cs

@@ -366,6 +366,8 @@
        {

            case 73:

                return 2;

            case 29:

                return 2;

            default:

                return 1;

        }